Do you still have the 800,000 Thai baht on deposit in a Thai bank account in your name only?
Last year in February 2021 you did, and you obtained the One extension of stay as retired from the Hua Hin Thai Immigration office.
If it's still on Deposit, make application for Non O Visa and one year extension of stay soon after your return to Thailand. NO need to wait two months to apply.
******************************************************************************************
**********
*****
*****
*****
8/?mibextid=Nif5oz