Its a very difficult time to give any accurate advice right now. Admins need feedback as to how the new rules are being applied. Best I can say is bank
*****
0 now and prepare to use the 60 day visit family visa OR start planning a trip to Pnom Pen and get a non O there at the Thai Embassy (bearing in mind all the entry requirements in Cambodia and lThailand) .