I'm no pro but thought I'll take a stab at it.
Jolly Golem helps a lot vs a-muk (because he's faster than sassy muks, and speed ties speed neutrals) and does the same things as rhydon, if a little worse.
If you keep poliwrath, you probably don't need thunder punch on melmetal, and thunderwave...