@Chas ********
Why don't you apply for the single or multiple entry Non-O visa based on marriage or visiting a Thai family member in Laos?
Why use a tourist visa if you have all the documentation for a Non-O, especially with your history, unless you want to stretch out the time by getting a tourist visa, then a 30-day extension, then a 90-day Non-O in country, then finally an annual extension? Even then getting a single entry 90-day Non-O then a 60 day family extension then moving to an annual extension would do almost the same job.
As I understand it, you don't need proof of funds at the Savannakhet embassy for a Non-O based on marriage or visiting a Thai family member.
You can get a single entry visa for 2,000 baht (which you can stretch to 5 months with a family extension) or a multiple entry visa for 5,000 baht (which you can stretch to 17 months but you'll need to do multiple border bounces and then get a family extension at the end).
With either of these options you can move straight to an annual extension when you are ready. I don't believe that you have to use the full year of the multiple entry visa first unless you want to but someone can correct me if I'm wrong.
There are a number of posts about obtaining this visa from Savannakhet on this forum. Many of then will be tagged accordingly so they should be easy to find if this sounds like the right option for you.