On point 2, you're ignoring that nuclear has the same problem only even worse. There are very few companies in the world that can make reactor vessels and related stuff. In particular a lot of projects are bottlenecked on one company in Japan.

In any case, I think it's a weak point. We can scale up battery production. I'm not a fan of the Elon Hype Squad, but he's right about this point.