I was detained for 3 hours at BKK until we figured out a 'solution' ☕️
Definitely get an onward ticket, trip.com has good options with free cancellation.
And id recomend doing VIP entry as well, less questions are asked, if any. Almost guarantees you entry. Some visa agencies offer this. I can send you a contact if you dm me.