Yes you have to do I-94 correction

Technically you are now illegal in the States, because your new I-94 issued when you re-enter US overrides your I-94 on your I-797 approval. So in the USCIS system you have overstayed for a couple of months. This is due to human error made by BCP officer, like what I said in my original post. The only way you can have this fixed is to go to Immigration Deferral Office of Customs and Border Protection.