@Marc *********
you could indeed do that and that would "wipe the slate clean" 🙂
either get a 90 day Non-O visa from the thai consulate for 80USD when you're in the US Then come in and 2 months later apply for the year extension for 1900baht
OR
come in free stamp, apply first for the 90 day Non-O visa at the immigration office for 2000baht, then 2 months later apply for the year extension for 1900baht
either of those scenarios would work just as well (as long as your immigration office sells in country Non-O visas, some don't) 🙂
Sincerely good luck with it sir (y)