Canada <---> USA is kind of like Frying Pan <---> Fire in terms of income tax. There is a really good income tax treaty between the two countries that will eliminate a lot of little wrinkles.

For the moment, stick with the TN. It means that you can easily exit the USA and eliminate exposure to US taxes if you need to.