It would be well worth your while applying for the Non-O whilst you are still in the US. It's an e-visa so easy to get, needs $15,000 in your US account. With that you'll avoid onward flight issues, minimise visits to immigration in Thailand and will make getting a bank account a whole lot easier.