As the most important Pokemon, Pikachu really needs to be the final stage of his line. Raichu needs to be retconned out of existence and his name reassigned to a new middle-stage between Pichu and Pikachu.