CATL and BYD have already shipped the Sodium Ion batteries that cost nearly a third of LiPho and half thstmof Li-ion at similar densities, you can buy cells and cars in China already. They also both cells and cars out next year with a 2x density Li-ion next year, it’s already been showcased so we know it exists but it’s not on sale yet. By the time Toyota ships this Chinese companies will have been in market with a comparable product for many years. Sodium ion will do great for existing range ans replace LiPho for power storage and hpthe new Li-ion will be used in high range cars and probably replace all Li-ion in everything where density is preferable to price.