@Greg ********
just wanted you aware of what you're in for seasoning wise with your funds was all
You can go apply for the yearly extension when you have 30 days or less left on your current 90 day stamp, will take new bank letter, updated bank book, new copies etc and will cost 1900baht.
NEXT year you can "change the reason" for your extension to one based on marriage without any issues.
And to stop any 'confusion', next year I'd make sure that you ONLY had 400K baht in the account for 2 months when you apply for it that way they can't "forget" and give you a retirement extension (as you don't have the funds for it).