Not sure I agree. When you say energy output, I assume you mean range? Or do you mean speed of recharging? In either case, I think you'll see by 2025 that recharing speed is basically down to the amount of time it requires to refill your gas tank. 

What do you suggest is going to occupy the additional market share for cars? ICEs? I don't think that's likely, as even manufacturers are moving away. And, it's certainly not hydrogen in the short run. The reality is that the infrastructre needed to support fuel cells is a generation or more away. EVs don't require massive upgrades to infrastructure to work. All that needs to happen is improvements to the battery chemistry.