Solid state batteries are a step forward, probably a big one.
But they still need charging and my view is that outside the urban/suburban areas it will be another 5 years before fast chargers are everywhere.
Hydrogen is going to be a player, especially for white vans and larger.
Synthetic gasoline will be available for toy cars and their petrolheads.
Diversity is the name of the game, actually anything that does not involve fossil carbon! Diversity is good.