Everything has happened the way it should have. The only mistake DC did was the New 52. Flashpoint was originally intended to be a Flash story only and should have stayed that way.

The sidekick will NEVER take the mantle from the hero. That's comics 101. Whenever it happens, will be only temporarily (or a huge mistake doomed to fail).