They are almost exclusively focused on autonomous cars, humanoid robots, and energy (batteries now, maybe more solar manufacturing later).

As much as I dislike it, I can't disagree with the business case here. They already have >300k monthly subscribers at about $100/month. That business will grow rapidly from here as well as the robotaxi business itself.

Within 2 years, this business will look radically different just because of these two changes.

Lol keep dreaming. Those 300k monthly subscribers could churn. Robotaxi isn't two years away. Not even close.