Energy: Hybrid Inverter Support

I have a hybrid inverter by GivEnergy and it manages my PV array and DC battery. Currently there is no integration for this inverter. However when it comes, it would probably need an inverter (with a subset of the PV, Battery and possibly wind) option within the energy module. Currently I have it under the battery but I’m not getting the PV readings from it. This should really be its own setting.
Graphically I would expect:

Grid <--> Home
Grid <--> Inverter
Inverter <--> Home
Inverter <-- PV
Inverter <--> Battery

This would be a better reflection of some peoples real world setups.
(And if someone wants to hurry the GivEnergy integration along I would be a bonus)