thank you for the detailed response. Due to our travel dates it won't work on my current entry stamp, and after returning I won't have 45 to run down visa plus 30 under consideration (75 days in Thailand plus spare days).
From what I've read of other people's experiences of the 1 year marriage extension maybe I should be glad I don't have to do it this year 🙂.