get TN when you come back

the H1 will be stopped. Start using your canadian passport. There will be no trouble entering US. There is no limit for TN as of now, but you need to renew it once a year, it can be done by mail.