Might be worth it if it curtails the hordes of Israeli's and Russians 

https://www.bangkokpost.com/business/general/3257580/thailand-ends-60day-visafree-stay?tbref=hp

Not law just yet but expect the changes to go through soon

Having avoided the middle east now for at least the last decade there's no way I'm going to be tempted by saving a few hundred quid. Strange really as I used to have a gold card with Qatar Airways but after the Icelandic volcanic ash cloud incident left many stranded the decision was taken to fly direct to BKK whenever possible. That subsequently proved to be a very good decision during March this year when all flights through the middle east were grounded and our direct flight was unaffected. That said I have occasionally flown via Paris & Amsterdam but getting stuck there shouldn't be anywhere near as much of an issue.

But that is not for a visa. A visa still gets 60 days. Waivers still do too as they have not actually changed anything yet.   Correction, they just did. No announcement on implementation. China and India are back to VOA.

I agree, I found out the hard way about Insurance and their "Act of war" get out clause! I'm sure the girls will be pleased to see you in WN when you get back mate.