@Chris *******
totally correct, you will get a free 60 day entry stamp when you come back in (no need to get a tourist visa from a consulate before hand)
You get the documentation required at your immigration office together and go apply for the 90 day Non-O for 2k, wait the under review period (usually 2 weeks) go back get the Non-O visa and new 90 day stamp inked in, then wait until you have 30 days or less left on that, get new documentation, go back and apply for the year extension for 1900baht (it will be issued on the spot)