And to add to Tod’s response, if you switch to the Non-O Marriage extension, you can keep this visa type. If you later get a job, you can obtain a work permit under the same visa, so there’s no need to switch back.
In my experience it gets denied if I don’t do it 15 days before or 1-2 days later. Remember you MUST apply in person the first 90 days report after a trip back from abroad.
You only have to report if you stay in Thailand for more than 90 consecutive days. The report is due 90 days after your entry. Every time you leave it resets.