That is exactly the same approach that I'd be taking if I was in a similar situation.
This is also the same thing my daughter said to me a few months ago when discussing her plans for a return visit to Thailand.
Realistically (I know MFAS will like this) 2023 is a much safer bet all around.