Yeah, agreed with Manectric. But, should I keep the last slot Thunder Wave? And I did try Rivalry, and it is crap. Shuckle gets hit by Sharpedo's Waterfall, Blastoise's Surf, and Nidoking's StoneEdge, though. Bulky waters also don't like Manectric/Luxray and Drifblim.
Edit: On second thought, I...