Grace period ending but got new job offer

Hi all, recently I was laid off and my grace period is coming to an end. A few days ago I got a job offer for an engineering position. My plan is this: leave a day before my grace period ends and then come back a week later using my tourist visa (B1/B2 BCC) and then leave again for my TN visa appointment and re enter using the new visa. Is this advisable or should I stay in Mexico until I get my new visa? My attorney says that my tourist visa was cancelled when I got the TN but I told her they weren't mutually exclusive and then she said I was right.

What do you suggest in this case?

Thank you!