@James ****************
, know that I mean no disrespect in this answer BUT you or the company you volunteer for failing to understand or follow the rules as they are is not grounds for them to waive the rules.
I think you will have to leave the country and start all over. BUT
That's just what I think. You won't know until Thursday the 2nd when the thai government opens back up and you can actually go ask someone what happens in your situation.
I don't think you're gonna get any good advice from the group, so we're done,
Good Luck,