You would like to avoid a trip out of the country and coming back in and going to quarantine again get a retirement visa. But this is exactly what will happen if you don’t change and come in on a tourist visa
Not necessarily recommend to get, but many people buy return tickets on airlines that have a good track record of giving you a full refund if you cancel within 24 hours of making a reservation.
do I understand you correctly to say that you bought a one-way ticket to Thailand? I’m not sure how the USA Embassy gets involved since all my dealings were with a Thai Embassy. Please clarify for me. Thanks