The naive solution to the "people stop paying monthly utility bills" is to charge a high hook-up fee that covers that capital cost of baseload availability and then charge for marginal usage closer to marginal cost. Right now the baseload infrastructure is covered by artificially high costs for each marginal kilowatt-hour to slowly recoup the capital expense. The billing structure doesn't match the cost structure.
But that would make actual use effectively free and disincentivize conservation. So it's a hard problem to solve.
You could perhaps raise the effective price of solar by writing in high per-month fees for any houses with solar, but also waive those fees for homes which prove they have a substantial-enough battery solution to help ease demand on the grid during the relatively high-use hours of 5PM to 10PM.