u/LankyPower55

My H-1B extension was approved by USCIS from December 27, 2026 to December 27 2029 on August 5. I still don’t have the I-797 approval notice, (just the email from USCIS about the approval).
I recently entered the U.S. through pre-clearance at Toronto (YTZ). The CBP officer did not admit me until the new I-797 end date and instead issued an I-94 only until December 27 2026 (matching my current I-94 / visa expiration).
My passport is valid until April 2032.
I need to correct the I-94 so that it reflects the full approved period through December 2029.
Is this a problem? Please let me know the answers to the below questions:

1. Can Deferred Inspection at a CBP site such as IAD, or another one fix it? Which are the best ones that fix it via email/ calls.
2. Whether a short trip outside the U.S. (e.g., to Canada or Mexico) and re-entry while presenting the new I-797 is a reliable option? Should I go to Mexico or Canada between December 17–27, 2026, while my current petition is active, or can I use AVR to leave and enter in January 2027? I will only be traveling for 1–2 days just to resolve this.
3. Any risks of continuing to work past the December 2026 CBP I-94 date based only on the current I-797.

thank you