Marriage visa more painful each year than a standard visa.
Just go for a standard retirement visa outside of Thailand and put the
*****
0 in the bank when you are here next. Needs to be in the bank 4 months before your renewal so you have time.
You could do with a residency address but that can be done through a written agreement