Your plan is sound. The initial Non-O marriage Visa is a 90 day stamp and the 12 month extension is repeated every year (you purchase a re-entry permit separately if required). Both require a Thai bank account in your name with B400k at the time of application for the first year. Subsequent years can use the B40k "income" method.
Getting married in Thailand is a fairly easy process as long as you are near to or stay in Bangkok for the Embassy visit and for the Ministry of Foreign Affairs visit. Depending on the Amphur where you plan to get married at it can be achieved in about a week without too much stress. All of the steps are listed here -
********************************************************