I had to re-add a Sonos One a while back and it went a lot better. But what is still a disaster is the whole audio PIN and then having to press the button and then getting the ‘something went wrong, go through this whole process again if you feel lucky’.