What is the process for switching to a marriage visa in Thailand after marrying a Thai citizen?

Good morning. I'm just making sure I have my information correct here. I'm going to get married to a Thai woman this month and I will get my marriage certificate from her Amphur. If I want to switch to a marriage visa, I can get a 1-year long, multi-entry Non-O in savannakhet, Laos for 5,000 THB as it does not require 12 months of international transfers to Thai bank, or 400K in a Thai bank. With this visa I will have to exit and come back into the country every 90 days. After that visa expired, I could then switch to a different marriage visa that would allow me to not have to border bounce every 90 days, with the understanding I show 12 months of international deposits of 40,000 THB in my bank book. Does this all sound correct?