OP, you could exit Thailand and reenter visa exempt (border bounce).
Obtain a non O marriage.
All you need is funds in bank on day of application.
With that 90 day stamp allow the 400k to season for 2 months and obtain 12 month extension.
In other words start over.
Not best option but nonetheless is an option.