@Ja**
given your entry/exit schedule I'd say you're WAY better off just pulling another year-long, multi-entry Non-O visa based on marriage from one of the thai consulates that will issue it.
That gives you unlimited entries/exits to the country for the validity of the visa (a year from the date it's issued) and each entry gets you stamped in for 90 days