h4 pending, if got new job

Hi, I used TN before and got laid off, I filed a I539 to change my status to H4 and now on H4 pending. I will get an offer very soon and I'm not sure how should I properly handle my visa application. Can i go to the border to apply TN and then revoke my H4 application or should I ask the company to transfer my h1b to the new cmopany, the old company applied h1b for me but I never got chance to activate it.

Thanks in advance for your advice.