You should have fixed that way earlier. The period you can stay all depends on I-94, not your H1B valdation. The best way to fix it is going out and coming back in, then you will get a new I-94. But you need to make sure you can come back. You may want to consult a good lawyer.