I'd say just move it all. You can use the same Wi-Fi SSID (or worry about it later), Zigbee should sort itself out, and if Z-Wave doesn't work out what is going on you have the repair option. At best it will all work, at worst nothing will work, most likely quite a bit will work, and you'll still have the option of starting afresh.