@Farhan *******
the answer to your question will rely on cooperation and support of your employer, Thai Labor Ministry and Thai immigration to seek a non b visa for your work. Is it for teaching?
I believe that you can continue your Master's degree studies under a Non b visa and extension of stay.
So right now it appears you are on an extension of stay based on your Master's degree studies.