@David *********
yep, that's the easiest thing to do AND Savannakhet is a soft touch consulate on those Non-O visas based on marriage to a thai, 2000baht, no proof of funds, minimal documentation, walk up service, get your passport back the next business day afternoon.
I'd just go get one, come back in on the 90 day stamp and when you have a month left go apply for the new year extension. That'd move the renewal date to where you're needing it to be ๐