Good morning Thai visa advice team. I did go through the theme visa extension 50 based upon retirement but I'm still a bit unsure hence my post.

I'm currently on a O-A extention based upon marriage. It needs to be extended next month. To be honest my previous marriage extention was a nightmare. Witnesses, photos and personal house visits.

I'm flying to Vietnam next month for a week so my idea was NOT to get a reentry permit but get stamped in on return on a visa exempt for 45 days. Do my TM 30 within 24 hours of arrival. 30 days before my visa exempt runs out go to immigration with the necessary documents (I've always banked > 800k)and apply for a non O based upon retirement. Have I missed out on anything? I'd be very grateful for any comments

Thank you