Thanks WDM. I'm going to replace Golurk with Scarf Gardevoir, and replace Clear Smog with Sludge Bomb since Clear Smog is often too weak to break subs anyway.
That being said, I've found Waterfall to deal decent damage (40-50%) to frail physical sweepers like Swellow, Zangoose, and CB...