@Ian ****
You're in the home stretch ๐
It's a tedious process to apply for the non-O visa pay the 2000baht wait the under review period, go back get the Non-O and 90 day stamp inked in, wait 2 months, go back apply for the year extension pay the 1900baht, get the 30 day under consideration stamp, wait for that time to wind down and then finally go get the year extension inked in
BUT you're just at the last step, sit tight, wait it out and on the 7th go back to get your extension inked in..
don't forget after you get that year inked in IF you're going to leave anytime this coming year you need to buy a re-entry permit (single 1000baht or multiple 3800baht)