Can I Switch from a 1-Year Non-O Visa with Border Runs to a Standard Non-O Visa Based on Marriage?

If you're going to apply for a yearly extension of stay inside the country by meeting the proof of financial requirements there's no real reason to get a year-long, multi-entry Non-O. Just get the 90 day single entry and then apply for the year extension when you have 30 days or less left on that 90 day stamp.

YES, With this visa you get every entry a maximum of 90 days of stay. Depending on Immigration Office you can apply between 30 days and the last day of each entry for the 1 year Extension of Stay based on being married to a Thai National and with this Extension of Stay, you report your self every 90 days at Immigration Office.