Model S is already MORE mass-market than Bolt will be for some time to come.
You are missing the point. Do not let facts get in the way of the good story:
1. Bolt is a mass-market car priced at $37,500 and planned to be produced upto 30,000 units per year (how many sold will be anybody's guess)
2. Tesla Model S is a niche toy for the few rich (selling over 50,000 a year is just a distraction, it does not match the definition of mass-market)
3. Tesla Model 3 is not mass market either, it will be too expensive at $35,000 starting price (production numbers simply don't matter)
So get on with the program and do not confuse the rock-solid definitions of tftf.
[/sarcasm]