Hm, yes. I'll add Crunch over Night Slash. I'm hesitant to try a more physical-oriented set, as Choice Scarf Ice Beam is one of my main counters to Dragon Dance Altaria, and that would weaken it. With the current set, Hydro Pump is a stronger water attack.
Rock/Ground is an excellent attack...