check with the airline. I was in the same situation, had a 60 day tourist visa and a 90 day return ticket. Flew with Thai Airways without any issues of needing to show onward travel within 60 days.
I'm sure there will be other options, ie your original 30 day, +30 then a 60 day covid. But there are better guys than me here that can direct you better 👍