not complicated... just have your new property owner file the TM30 with local immigration office. Get a copy of residency certificate for stapling in your passport.
you assessed the situation correctly. Guess I will have to take the next step which is to somehow apply inside Thailand for an extension of stay based upon retirement, with the 800k in a Thai bank.