I agree. Tesla's whole philosophy, I think, was to get people to buy their cars simply because it's a better car, not for any environmental reasons. Oil prices will affect them, but can't destroy them
At least out in my exurban area, upper middle class guys buy Teslas so they can race their sports-car in the carpool lane on the way to a middle management job.
Tesla has been explicitly thanking current buyers of Model S and Model X for doing their part providing cash for this environmentalist project. Elon's earliest statements admit that they can't compete on price as a startup. But they have been driving costs down rapidly and their philosophy as OP stated, is to be the best car available in all senses, and not rely on environmentalist good vibes for sales.
They already did this for acceleration, automation, and running costs. They still have some categories to go. But that doesn't invalidate the suggestion that their philosophy is about feature parity, as opposed to environmental charity.
I think what OP is getting at is that Tesla isn't aiming for just that demographic. Musk has always wanted to produce his cars so that they are desirable to everyone.