Issue with Including Zero Counts in Average Calculation Measure in PowerBI

Okay so this helped in some way by solving the 0 issue, so thank you! However I think because I am now focusing on the total sessions per day, rather than the average sessions per day, the overall average calculations don't seem quite correct. 
Rather than the average of the sum of sessions per day, I actually need the average of the average sessions per day. 
Take my example above, while the sum of sessions would be 7, the average of 7 sessions by 3 chargers is 2.33. For arguments sake lets say those chargers has the same output for the 30 days of June, then the monthly average would of course be 2.33. But based on the sum of sessions the monthly average would be 7. It is really important for me to do this on a per charger level. 
The inital formula is almost working that out, but excludes 0s. I think if I can resolve that then the overall average formula would make sense.