As Sheryl mentioned in the other, now closed, thread, making the short trip to PDA in Bangkok may be worthwhile. I had it done there a couple of years ago. Very quick and easy, in and out in an hour, and only a 5,000 'donation' required.
https://pda.or.th/en/contact-us/