@Greg ********
best bet is to go with a visa company and do a border bounce. They handle everything and you don't worry. This year many people on flights back in have beened questioned at length so they are tightening up. A company I've used in the past charges ฿4000 for mainstream countries like UK USA NZ and Australia. I can pass those details to you if your in Bangkok.