Thanks Nelson.
In the case of 2B, If, for whatever technical reason (e.g. poor TN letter), I can't get the TN, I can come back in on H1-B before it expires, right?
The problem with 2B is that nothing at the border is guaranteed and I cannot give my current employer a proper 2-week notice. I...