You have two options, and both of them need you to exit Thailand without a re-entry permit, because this is the only way to invalidate your O/A stay permit.
***Option ONE is applying for the 90-days Non-Imm-O Retirement Visa outside of Thailand, re-enter and get stamped in for 90 days, and up from 30 days before the 90 days are up, use the bank letter that confirms the 2-months seasoning of 800,000 THB to apply for the 1-year extension of the stay permit based on retirement.
*** EASIEST is Option TWO: it means re-entering Thailand visa-exempt, you get stamped in for 60 days, and visit Immigration to apply for the "change of visa type" from the visa-exempt entry to the initial 90-days Non-O visa.
For this application, you need to show that you already have a minimum of 800,000 THB sitting in your Thai bank account, and you need a proof that the money came from abroad.
And you will - at least on most Immigrations - need a rental contract.
Check the requirements under number 9 of this list on the Immigrations’s website regarding the “change of visa type”.
*******************************************
Visit your Immigration before you make the move, make sure they are accepting applications for the “change” and make sure you meet THEIR specific requirements for the “change”.