I would like to suggest a little change in pidgeot since is a good poke and a bit forggoten.
First change the move Pluck, a close range and not that high dmg dealer, for Faint attack a range and almost the same amout of dmg move, mirror move that would help in pve and change twister for heat...