we had a same case as yours. Just a few weeks ago we went to the department which is the place you said in your (1), and they made a correction and gave a new I-94. Take it easy. Do it to correct it.