@Kevin ******
Hi. You might want to check out the OA visa available from your home country. It would give you a visa valid for a year but does need health insurance and a police check. Many use this visa to eke out almost 2 years with planning and not needing funds in Thailand.
A Non O based on marriage or retirement would only be valid for a 90 day stay unless you extend for a year.