Took the plunge and bought a USB Zwave device
https://www.amazon.com/gp/product/B00QJEY6OC/ref=oh_aui_detailpage_o00_s00?ie=UTF8&psc=1
I have 5 light switches, some electrical outlets and a few contact sensor on zwave but with Smartthings, I will slowly migrate them to the zwave USB and HA on the raspberry. Most exited about the CT100 thermostat and using the CLIMATE entity in HA.
I will still rely on MQTT for the zigbee stuff until I can swap it out but my goal is to move off of ST completely by this time next year. I am on v 1 of the hub so one less device in my automation setup will be nice.