I would look at the numbers for solar alone as well as (/before) looking at the numbers for both. There’s a bit of interplay but overall I’d see them as distinct, not inextricably intertwined in a “system”.
Simplified financial analysis of a generating device is straightforward. And on the basis that you’re adding renewable generation to the mix in place of buying grid power, the carbon/sustainability advantage is clear enough. Estimating output per year I’d start with a reasonable established local benchmark. Start with say 1000kWh for each kW capacity you’re installing. Annual “Income” is then splitting that generated power between what you’ll save in power you’d have bought from the grid, so price at what you’d buy it for, and that which you’ll export, so check what you can export for, plus any subsidy/tax etc considerations, which should also be straightforward. And small nowadays. And stick a finger in the air for inflation, but it’s not zero.
I’m out of touch with some of the key variables so I don’t quote numbers but those variables should not be hard to source.
If someone gave me some payback figure without the workings I think I’d pay it little attention, ask for their inputs, check them and do it myself. It’s not hard.
Batteries, however, open a more subjective debate. Sustainability impact is arguable. And as others have mentioned above the financial case relies on particular circumstances to make it worth doing. And the calculations are therefore also pretty subjective in my view. That’s not to say it’s a terrible idea, I might do it myself, just that it’s not a clear case.