You could get the 90 day non O, enter Thailand then get a re-entry permit, leave for your work rotation, return and apply for 1 year extension and when you get the extension, get a multiple re-entry permit then you're free to come and go as you please. There may be a bit of dates juggling while under consideration but it should work out about right if you are on a
*****
or similar rotation.