Couple of good suggestions, thanks.
Actually, I just confirmed with T-Mo CSR that my Smartphone Unlimited Web plan includes Canada as a domestic region, so I should be OK with keeping the SIM card in the phone.^
I even had the rep document that she confirmed it, just to be safe, in the event that I do get hit with the nasty roamimg charges upon return to the US.