My problem is that a lot of these cars are getting more complicated (in terms of electronics) to the point where the indies won't be much help either IMO.
Yep. Just look at Tesla. They've pretty much made it so that they are the only ones who can work on their cars.