Anyone have experience with this situation?

I am a US resident and passport holder. I used to visit Thailand frequently but have been away since before Covid. I have two upcoming trips planned somewhat close together.

First trip, planning to depart BKK early morning Monday November 29.

Second trip, planning to arrive BKK morning Saturday December 18. That’s 19 days out of Thailand. During the 19 days, I’ll spend a couple days in the air, no stopovers, the rest at home in the US. Only transits at airports without entering the transit country.

So, in the 21 days prior to the second arrival in BKK, I will have been in the US and Thailand. I know I would be OK for “test and go” 1-day entry if I were a Thai national returning from 19 days in the US. And I’d be ok if the countries for my prior 21 days were the UK and Singapore or the UK, for example. Common sense says I should be ok for the second entry. But it seems to be a gap in the way the rules are written, in English anyway.

Any authoritative guidance would be appreciated. My hotel is asking TAT if I’ll be ok.