Get the visa so you do not need to pay rebooking fees on the ticket and waste a day at immigration. You can extend that 30 days too if you don't mind missing the bobsled finals.
Good, keep the direct deposit day towards the middle of the month to avoid screw-ups for holidays and the like. Thai and American holidays can cause interruptions. 👍