@Gary *****
Then you'd need to apply for a reentry permit before you leave so you can re-enter with you Non-O.
Also, you need to apply for a 1 year extension of your Non-O. The time varies by office but I believe Bangkok is 15 days before expiration, I'll have to confirm that though.