Nice write up. Is there anything you didn't like about Hub and Spoke?
If it's the power consumption, I think the enOcean kit generates it's own power, or something 🙂
We make the apps for the Energenie MiHome range, so I get to play with their kit in the office quite a lot! It's a relatively young product but is made for the UK market and works well. Find them on Vesternet and Amazon. There's a Rasberry Pi module for tinkerers too. It's a Wi-Fi hub and spoke setup. There is a light switch too, which I haven't tried yet but someone in the office probably has.