Hey, quick suggestion for the Excadrill. I have used focus sash to pretty good effect and it may be useful here. Normally, the multitude of hazards would make a focus sash a waste but with your ability to wish on umbreon, it could serve as a guaranteed sword dance, rapid spin, or revenge kill...