@William ********
most people wait until their current extension runs out as there's no great hurry to switch from one to another.
When you go for your 90 day report get the hand out listing the requirements to apply for a yearly extension based on marriage from the immigration office.
Remember if you met the financial requirements for the extension you're on based on banked money method (the 800K) you still need to keep the 800K in the bank for 3 months after the extension is granted and then can't let the balance go below 400K the rest of the year before you switch to an extension based on marriage.