I used your advice for most, if not all of the changes.
HP EV's => Speed, this has buffed Thundurus a lot
Aerial Ace => Substitute, has got me into many situations where they cannot damage me and they just die to toxic
I have been switching in and out of Azumarill/Keldeo, I had Sacred Sword...