When I did my yearly extension (Non-B,) they checked my TM30 was in place.( Bangkok) but as someone might or will say " every province can be different"
Marriage visa is the best, in my opinion, If you finish with one company you move on to the next, but as Robert said " if you get divorced" the Non-B will keep you working but changing companies you have to leave the Kingdom and start again.
Thanks, I've been waiting for my landlord to return from the US, and I can proceed without the authority. I am in Bangkok and I'll pick up the form on Tuesday. You have just relieved some stress. 🙏