Regardless of the long term trends toward populations moving toward the city, I don't see why most newly built suburban homes after 2025 wouldn't come with a Tesla (or competitor) solar roof.
The 20-50k that it would cost would just get absorbed into the mortgage and become an asset that would increase the value of the home - besides that, over the over a 30 year period, if you are able to capture even half that value in electricity savings, it becomes a no brainer as it would cost what a normal roof costs anyway.
There are also the benefits of more efficient energy transmission and resiliency of micro-grids as just bonuses.