I updated my OP to more accurately reflect my HA hardware in use here.
Home Genie (HG) now controls every thing here I currently wish.
I can even Arm my security console and pictures are emailed when the security system is tripped
Disarming is also possible but I've purposely left that option out.
Every thing I did with AHP and its plugins I can now do with HG + much more.
The HG timers and macros are far superior to AHP.
I still use HA-Bridge to allow voice control of things via Alexa but it has been moved to my Pi with HG.
I can even Arm/Disarm my security system via voice though with the location of the Amazon dot in relation to the DS7000 Alexa can't hear the disarm command if the system has been tripped.
I discovered the code in HG for interfacing to a Philips Hue hub is basically the same as what is required to interface with the HA-Bridge
With some minor tweaking of the code I can control things with HG which HG normally couldn't.
My CM15A is now connected to the PI 3B+ 24/7 but it use to be connected to the thinclient 24/7 as well to enable remote control from the city.
Although the thinclient used very little power the Pi uses even less.
I still have my thin client PC setup but AHP is no longer used here. It looks like its days of usefulness are numbered as I find streaming works better from the Pi
, even if that is all the thinclient is doing
I still have a WM100 running here too but I really don't know why
I guess it is to help debug the Wi-Fi App.
However without some movement on the development of the Wi-Fi App it too will vanish from my setup here.
Currently the only benefit of using the WM100 over the CM15 is a stronger PLC signal which I don't have issue with here. The WM100 actualy uses a little more power then the CM15A as well though not as much as the CM15A and Pi combo.