As for catching ICE up I believe Samsung are close to releasing new solid state battery tech which features the same capacity at 50% volume so a substantial improvement.
After that there’s glass substrate batteries coming which are something like 10x the capacity & charge in seconds being worked on by the guy that invented lithium tech batteries John B Goodenough (best name ever)