It is a matter of personal choice, but no, the battery should be outside of the ‘home’ and should act as a temporary storage of “grid export /.time-shift import” energy.
When you charge a battery, you are not really consuming the energy since it can be returned later. When you discharge a battery, the energy can go to the ‘home’ to be consumed, or it can go as export to the grid. Adding ‘charge’ to the ‘home consumption’ corrupts the real consumption figures and creates an issue in accounting for the discharge later.
Given the number of posts around the Energy Dashboard, and the Energy Usage graph in particular, I agree that it often must appear confusing, but I believe it to be a well thought out and better option than the alternative with battery charge as part of the home consumption.
This is my Energy Usage graph for today (so far…)
I can see exactly how much energy the home consumed, and I can see that in the early hours this came from grid import, during the day most of it came from solar, with some top-up from battery discharge.
I can see that my battery was charged with excess solar in the morning, and that later when my hot tub started running at 11:00, the solar met most of the home consumption, with excess still going to battery and any unmet consumption coming back from battery discharge.
I can see that I am now running entirely on battery discharge.
I can see that all excess solar went to battery, with nothing going as grid export.
I can see my solar generation [yes, I agree that to see this requires standing back and squinting at the graph, but the solar PV generation is the yellow and the red combined]
Since you posted and asked, I like it as it is and I think it is entirely correct, and I think you should put your setting back as you had them. However, we can always agree to disagree, and you are, of course, entirely welcome to do things as you think best!
Best wishes!