you're right where you need to be
@Adam *********
(y) (y) ,
just burn down 2 months on that visa,
keep the funds in the bank too as it has to be in for 2 months and then get all new documentation
and
go apply for the year extension for 1900baht
remember though, if you need to leave the country during this 90 day stamp you're on you need to buy a re-entry permit or you cancel the stamp when you leave and will have to start all over again.