I think another benefit of rooftop solar related to your second point is that it also lowers the demand on the grid. It also adds some ability to develop disaster resiliency in terms of having hyper-local power generation.

Solar still needs to contend with the fact that demand peaks are not aligned with output peaks (ie the famous “duck curve”) - which is of course where storage and other power sources need to be used in tandem. Still, rooftop and large solar installations will both need to be used.