I would just apply for the tourist visa as early as possible. If it changes they’ll be masses of people trying to get tourist visas and it could take a while.
I never been asked but my friend was asked yesterday by Don Muang immigration how long she will stay and her onward ticket as we flew in from Kuala Lumpur. 15 mins from debark to walking out the door. Fantastic.