Easy way of swapping current devices for new ones?

Don’t ever use device automations (use the other trigger/condition/action types, ones that don’t require a device_id) and you will find it is a lot easier.