@Stacey ******
remember IF you get a yearly extension (or any extension) you'd also need to get a re-entry permit if you wanted to leave the country and come back (they are 1000baht for a single entry and 3800baht for a multiple entry).
If I were you I'd just stay on this visa as long as you can, and as long as you come back into the country before it expires you'll always be stamped in for 90 days.
One more thing, even if you stop working, no one can cancel that visa because they can't be canceled. So it'd be good until
*****
/2018.