TN is still possible if you withdraw the I-485 and abandon immigrant intent. But, that is not a consideration for me right now anyway. If you follow the thread above, you will see that the choice is between staying in the US on H1B and moving to Canada as a PR.
Also, if it was a question of 1 or...