Good question. I am booked from the UK in January.
Originally I booked to Bangkok for a couple of days and then a separate flight to Samui.
Then because of the sandbox rules I asked my International flight to add on Samui to fly all in one go.
Now I'm thinking I will be better going to Bangkok again. ?
I still have my separate Bangkok to Samui flight that I haven't cancelled yet so I think I'll wait until Xmas to see what happens