I would try the thunder shirt again! It doesn't matter if he spends his time trying to get out of it - it means he's focussing on that instead of panicking about the storm.