Good evening! I just want to ask few questions regarding cancellation of visa and work permit.

I plan to resign on my current employer this coming Monday for I have accepted an offer from another school to work with them.

My Non-B Visa will expire on May 31st and my questions are the following:

A. Do I need to cancel my Non-B Visa and ask for a cancellation letter once I surrendered my Work Permit to my employer and exit immediately as tourist?

B. Or is it okay to stay and maximize the remaining days of my visa until 31st of May and wait for another Non B documents from my new employer?

It's only my first year working in Thailand and I'm really a bit confused.

Hoping for positive feedbacks regarding this matter.

Thank you in advance and be blessed. :)