Payback won't land til year 9 or 10 based on current numbers so want to be sure we count it correctly
I think that is an incorrect method.
The better method is to convert the cost of battery to cost of storing electricity in cents/kWh
The numerator depends on
Capital cost of battery
Cost of capital
Period of warranty
For example if cost of battery is $21000
Cost of capital is say 6%.
Period of warranty is 10 years as most batteries have a 10 year warranty.
Over a 10 year period the total cost of battery = $28,000
(Think of this as paying back a $21,000 loan with monthly payments over 10years )
The denominator is the number of warrantable kWh over that 10 years. This can be found in the warranty battery. In the $21,000 battery example above the warrantable kWh is 142000 kWh
So the cost of battery is $28,000/142,000 =20 cents/kWh.
Using this figure, add in the cost of charging the battery. This is the cost of importing electricity from the grid. I also use a similar calculation to work out cost of electricity produced by solar. But the warranty is 20 years.
So as long as you only charge the battery such that the combined cost of battery + cost of charging is less than the tariff at the time, you are ahead.
The problem with using a payback period is that the retail electricity plan for houses with batteries is quite different to retail plans for non batteries. It's not comparing like for like.