H1B Holder - Need to renew Canadian passport

I got my first H1B this Oct. But, my passport expires in August 31/2012. On my I-94, the officer put end date to August 31/2012.

What I plan to do is:
Renew my passport over mail.
Next April or May, I will travel to Vancouver. On my way back to US, I will show them my H1B paper and my new passport asking for a new I-94 card.

Did I miss anything or should I bring some additional documents, should I contact the company lawyer for some additional guidance ?

I know I am being paranoid, but just want to be sure. Thanks !

Yes, your being paranoid. You will be given the remainder of your valid H1B status without any fuss at all. This is very common at airports. No lawyer needed.

Thanks!
Just had a rough year with VISA stuff.