I don't see how Tesla is a serious competitor in that matchup. Their sales have been declining for two years, and Chinese OEMs are clearly on the path to complete dominance in most foreign markets.

In the US market, I think Hyundai (and to a much lesser extent Kia) is probably the most interesting OEM. EV sales that aren't declining, the highest American-made percentage vehicles (relevant given recent policy changes), a manufacturing partnership with Waymo, widespread consumer awareness, and relatively lower prices than their competitors. It'd be nice if they provided a better repair situation than Tesla, but that's the current industry I guess.