You could try factory resetting the devices and using the z-wave replace to join them back to the same node. Here is a guide I made: [Guide] Updating Firmware and ZWave Replace
Other option would be to create Virtual placeholder devices, use swap apps to swap to the virtual devices to keep your automations in tact. Then exclude the devices and pair them again. Once paired and working again, swap apps from the virtual to the new devices.
