Energy Dashboard individual device

I use the energy dashboard with sensors for grid intake, solar intake and outtake an gas.
This worked well and I appreciated the UI view to see the power and gas consumption over the day.

Now I changed the heating source from gas to heat pump and of course added a dedicated meter for the heat pump to monitor the heating energy just like I did with gas.

I was surprised that I was only able to add the heat pump as individual device which resulted in a very unsatisfying graph not showing me the energy distribution over the day.
When I tried to add the heat pump meter to the main meter I (obviously) ended up counting the heat pump energy twice because it is also part of the main meter.

Are there any ways to solve this? I would like to add a dedicated hourly view of my heat pump consumption to monitor it like I did with my gas consumption. How do I do it.
Remark just to use the Gas view is not a real slolution because I still use gas just foe water heating in a hybrid system