"As solar appears on more and more roofs with their own battery storage there will be less and less call on the major grid power generators"
Unless the building is listed. Unless the slope of the roof faces the wrong way. Unless the roof has too many other fittings poking through………………..
Commercial users often need more power than a roof full of panels could provide. A charging station for full sized lorries will need solar panels installations over 150km square each, on average.
While there is more sunlight energy falling on the surface of the Earth than humans use for electricity, there are the other uses such as for plants and evaporation to maintain an active hydrosphere. Displacing the use of fossil fuels is a good start, but lowering the number of oxygen thieves and using energy ever more efficiently are important for the long term.