The Tesla Powerwall enables the uncoupling of rates and usage, but I'm not sure how long it takes for a return of investment.
The math worked out to 30 years before raw recoup. Once you add in a discount rate or life cycle would never justify itself. The per watt hour cost installed keeps to come down massively.
Solar and batteries are economical.