Yeah, you can't count any of the EV players out. 2035 is around the corner and represents a huge market for the taking. Some will be bought out by the establishment, others will disappear and some will make it on their own.
The biggest competition will come from China. They make the batteries, have the lowest labor cost, the financial strength and the drive to be leaders. Look at Tesla's factories... None will outperform Shanghai, ever.
Korea will slowly continue to move up market while Japan has totally failed to jump in the race, preferring to outsource their EVs to their competitors. Europe will hold on to their market share because of their protectionist measures yet will continue to struggle with their hard to export mass market (EV) production.
America will be a shit show, with a production base struggling to move away from ice to EV, a political environment in which one party will challenge anything the other party supports, where there is financing for great design ideas and prototyping but little behind to support serious production, because US production is very expensive.