Please, I know it is the most easy comment to make. Do not do it, nobody cares and yes I pay the fines. But if you are not willing to step up the plate, do not attempt to comment.
Thailand has laws, regulations and on this page we try to explain these and how to follow up on these laws, regulations.
But thanks for letting us know that all is allowed until you end up in jail or pay fines.
I guess you try to apply using the On line website:
***********************
And in there, just before the end you need to upload a health insurance as part of the requirements to apply for the Non Immigrant O visa based on being married with a Thai National.
You take both passport with you on return and show this to Immigration.
Your passport might be invalid but the Thai Extension of Stay and Re-Entry Permit stays valid to use.
You will get the entry stamp in your new passport. After arrival change of work permit can be done at Ministry of Labor and transfer of Extension of Stay/visa info at immigration.