No you don’t however I am assuming you have visitor visa for Canada. You can use AVR to enter back to the US from adjacent bordering countries if the visit is less than 30 days and if your US visa is expired at the time you enter back.
Yes. When you enter back to the US, CBP will issue I-94 only till your passport expiry. This means that you will either need to apply extension of status again or travel to Canada/Mexico CBP to extend your I-94 once your passport is renewed but before your I-94 expires.