With the (air) borders opening up, it might be worhtwhile to get a multi entry non-O visa from the Ho Chi Minh City consulate. There is no requirement of proof of funds plus the staff are friendly and efficient. I did this in December 2018 and January 2020.
An added bonus is that you can score an extra 90 days by re-entering Thailand on the expiry date of your visa!