Indeed. That's also why I carry Quick Guard on Hitmontop. It blocks out Heat Wave, Discharge, and Earthquake.
By the way, I carry Thunder Wave on Thundurus. Do you think I should drop it for anything? And how concerned should I be about those two Pokemon I pointed out, Cresselia and Eelektross?