Here's the chart with everything but battery+solar turned off.
https://imgur.com/a/5HfjAdI
Makes the scenario quite clear. No double counting.