Batteries are rapidly getting smaller and the capacity increasing. Innovation is reducing the demands on the battery and together all this will increase the endurance. This is no different with electric cars and so that industry will innovate. It has the resources to do so.
The old wisdom of 'don't repair old clothes with new cloth' is true. Retro fits rarely work: beset with problems and expensive. It is a whole package that will bring about change.