You don't want more than one move of the same type, for battling. So you'd replace Dive and Waterfall with better things: Earthquake, Ice Beam. Rest, HP Bug?!?, Curse.
Your set looks more like a SwissArmyKnife set, for traveling, not a battle set (it's all utility moves, which are mostly -...