There's a few luxury vehicles using solid state coming to market soon I believe.
It'll take time to build up the manufacturing scale before it becomes widely adopted so traditional Li-ion is here to for a bit.
Of course after solid state there's lithium air batteries next up. However commercial viability is probably between 20~40 years.