That is how I see things, but IMO Gen3 could eventually be 5 different Models with sales of up to 12 Million per year.
But overall, this is about the right number of Models especially if Gen3 is a number of Models.
Dropping Model S/X now or anytime soon would do nothing for the mission and would likely reduce Tesla profits, as far as we know there is still some margin being made on these vehicles,
Elon's frustration with Model S/X could be that Tesla doesn't have the engineering resources, and can't justify the tooling investment to make Model S/X as good as they could be.
- Cybertruck, Gen3 and Optimus are obviously a higher priority.
- Model 3 Highland and Model Y Juniper are higher priority.
- The Semi is higher priority.
- Megapack and 4680 are higher priority.
Model S/X and Roadster are low down the priority list because other products are more important both in terms of the mission and revenue.
I think there are only sufficient 18650 cells available to make around 65,000 Model S/X per year. We might find that new cells/packs are needed for the Roadster and these can also be used in Model S/X. Fremont could eventually make 100,000-120,000 Model S/X.
if RHD can be supported in good economics times Tesla can possibly sell 100,000 Model S/X worldwide per year.
Front and rear castings would be problematic for Model S/X due to lower production volumes, In the long run Tesla may find a way on sharing casting machines or using an old casting machine that is replaced.
The good news is Etherloop, 48V architecture, 800V charging, V2H, and steer-by-wire all seem like possible upgrades to Model S/X when resources are available and this will enable RHD sales.
As for castings, new battery, packs, and new cell types, the best hope for any development in that area is the Roadster.