Still one of the best suggestions to deal with war shufflers. 
For those unaware this thread deserves a mention again.
Came across another idea which might also act as a fix for the war shuffle issue, though I haven’t thought through the consequences of it. Will do a bit more, but on the surface it’s an intriguing idea. If the poster hasn’t proposed it as I suggested I might put it up for critique at some point.