I am posting this update for Z2M and ZHA right now and will submit it to Hubitat as well (might take several days depending on their turnaround time).
For energy monitoring to be accurate, you may need to factory reset and re-add the switch to the network.