i don't think we will ever move to a predominantly localised generation due to pure economics of scale; eg: concentrated solar thermal allows relatively cheap energy buffering on a scale not easily achievable with smaller scale batteries.
The efficiency of various generations and storage scales with size, so there will always be a place for centralised power.
My previous comment was about how batteries as an independent technology are now cost viable for load leveling.
Generation wise, renewables have been cost efficient for a while, they just suffer from load balancing and dispatchability issues which had prevented penetration of renewables beyond about 20%, before grid instability becomes an issue.
Here in australia we are beginning to have some issues, as solar power generation peaks harder than power demand during the day, causing coal powerplants to become less profitable due to not being able to ramp up for base load during the day, because of the dip in power demand at midday.
One report i saw [citation needed, cant find it now] said that there was risk of brownouts on a 5-10 year horizion due to under-investment in baseload, when comparing expected demand to planed new generation capacity.