For what it’s worth I’m booked in Thai embassy in London in May for kids passports and when my wife made the booking she asked if I could do visa while we are there for our trip in July for 35 days and was told we won’t need one for then
Explained about the 60 day waiver dropping down to 30 days and again she replied we won’t need one for our dates