+1 on the Aeotec Z-Stick Gen 5. I replaced an old HomeSeer Z-Troller with it and saw an immediate improvement in reliability. Plus, it's incredibly easy to add/remove devices.
The Z-Stick is compatible with everything I've thrown at it from an old 2Gig CT30 thermostat, to Wayne Dalton plug-in modules, to newer Z-Wave light bulbs. I still haven't been able to include my Schlage locks, but I think that's an HG issue, and not the Z-Stick because I had the same problem with the Z-Troller.
Cheers,
Mike