have a third option "just add/delete device" in the activity manager. The flow (just back and continue) in the wizard isn't disturbed then. It is a very easy initial setup.
Add a device - do nothing with the mapping. Delete a device - remove the assigned buttons from that specific device and leave the rest of the mapping intact.