Following the example of another member, for my next trip I have a Non-Immigrant O, with no requirement for Thai spouse. Thankfully. 90 days.
Last year I did not spot that option, so got a tourist visa (60 days) and had to waste a little time going to Jomtien immigration to get an extra 30 days.