This was a smart move to be on H1B. I was on TN1 for a couple of years, and then moved to EAD, which is a lot riskier.
Sometimes I miss Canada, I still have a lot of friends there, and some family. The economical situation here is scary these days, I hope we will get through it ...