Need help improving my team in pokemon heart gold?

currently sitting with sixteen badges. I feel that something needs to be replaced and i dont want to train any further to beat red with a team i wont stick with. Currently they are all about level 55 ampharos-signal beam, discharge, thunder wave. Dragonite-extreme speed, dragon dance, dragon rush, aqua tail. Crobat-bite, confuse ray, cross poison, fly. Arcanine-extreme speed, flare blitz, crunch, heat wave. Vaporeon-surf, aqua ring, last resort, ice beam. Tyranitar-crunch, earthquake,stone edge, rock slide. Any suggestions on move sets or replacing pokemon entirely would be much appreciated.