@Stefan *******
That's correct. My advice would be, as soon as possible, to transfer the 800K THB to your Thai Bank Account, and let it season for two months. At the end of the two months, you should have 30 days remaining on your 90 day Non-O based on retirement, and you can apply for the one year extension of stay.