Got it!! Also, why don't you travel back to US today as there is no mandatory requirement that you cant leave Canada before 14 days. Please see the following link and search for the keyword "Exception — leaving Canada"I'll be using AVR as mentioned. So I have an expired visa stamp on my passport, but an I-797A document with updated I-94.
https://orders-in-council.canada.ca/attachment.php?attach=39166