Yep
@Tomasz *********
you're completely wrong π
you are NOT entering on a visa exempt entry, you're comin' back on a VALID extension and re-entry permit (granted that is only good for one day) You're confusing entry types.
That you get a 30 day visa exempt entry IF you enter without any valid extension/re-entry permit doesn't factor into it at all. You're NOT eligible for a 30 day visa exempt entry because you're HAVE a valid extension/re-entry permit in your passport now
AND
just so you're clear, If you did come in on a 30 day visa exempt you'd then have to apply for the in country 90 day Non-O visa, wait for that to get reviewed, go back get it stamped in, wait two months then go back and apply for the year extension. So comin' in on a 30 day visa exempt wipes the slate completely and you have to start all over from zero.
Personally I'd figure out a way to change the date and get back here with enough time BEFORE your extension expires so you don't run yourself off the rails.
BUT you know what you're options are now (and as I said in the beginning, you DID have an extension of stay π )
Good luck,