What you want is Lithium air batteries. They have the potential energy density of gasoline and like gasoline use air for energy release. Likely 10 or more years till we see one.
However new higher. Density batteries like Amprius and Lyon are far less susceptible to fire and likely offer all the energy density needed to win over 90% of the market.
Solid state batteries are not far behind and also are not as phone to fire.
So the general direction for higher density batteries also reduces fire risk.

Hydrogen cars however would be, are a different story.