I agree with you, but I like the baffoons and the fungalmancer tech, however I will say ditching the rhynos for more control is a good idea and if you get rid of Leeroy I would replace it with terrorscale stalker for more deathrattle support.