If your stuck make an appointment at an embassy and show it to the immigration officer on arrival in Thailand and say you have to get paperwork in Thailand then are leaving to get your visa. Then cancel the appointment.
It will give you some time to arrange the appropriate visa organized