I wouldn't get hung up on paring battery storage with a particular generation technology. Just connect it to the grid and let the market decide when to charge and discharge.
One good reason for colocating battery storage with renewables is that you get to share the grid connection. That connection can be expensive and will be under utilized due to intermittency. So store some of the energy in batteries and spend less money on expensive AC cables. You can even reverse the flow and take energy from the grid.
Costs are dropping so rapidly that typical 5-year timelines for utility planning and procurement is running into some problems. People who make bids have to anticipate their costs in the future, so there's considerable betting going on.
Agreed on the heat pumps versus fossil heat. I moved in the past few years, and replacing all the natural gas is my first task before installing solar. By replacing natural gas with a heat pump, my total energy consumption has plummeted drastically. However, my utility charges only about 15% as much for a unit of natural gas energy as it does electrical energy, which eliminated the cost savings! So now that I better know my total energy consumption the switch to solar will happen very soon, and save me a ton of money.
Current state of the art storage with solar is commercial viable around 75% capacity for 4hrs, with a charge cycle of 24 hours. Those numbers are a good improvement over 0% storage, but there is a good reason why there are not a single commercial operated wind farm that use the same technology. Wind does not have a 24hr charge cycle, and 4hrs of 75% capacity does not do much when there first several weeks of good weather followed by several weeks of bad weather.
When northern European countries plans for stability, we are not talking about hours. This is why oil power plants get subsidized in countries who invest heavily in wind power. The reserve energy source need to be profitable while the weather is creating negative energy prices, regardless for how long such period last, because afterward you will need a lot of it to be available for an equal long period of time. This is the problem that storage need to solve and have yet to find any suitable commercial viable answers. You could improve the economic viability of current batteries used in PV by 1000% and it would still not be economical viable for wind.
When it comes to individuals and personal homes, the answer that most experts seems to conclude on is that solar and storage is something which comes after more fundamental improvements such as heat exchanges and replacing internal combustion engines with electric ones. Solar and batteries are nice, but the planet is still going to be quite damaged if we continue burning massive amount of coal, oil and gas in order to generate power that electric heaters demand during the winter.