My understanding is that solid-state lithium ion batteries (which should roughly double capacity while also being much less fire prone) are likely to be the next big thing with pretty much all major car manufacturers working on bringing them to market and the estimated timeframe being 2025-2030.