Separate DHW and Space heat monitoring

[Timbones (Tim)]

I have a fix for this. Will contribute a pull request shortly…

Edit: Issues mentioned above fixed in this update.