Ability to swap between BYOD and WB devices (both ways)

As discovered yesterday, it’s not easy to change from a BYOD to a WB device. This should also be available to go both ways. Now I have re-registed my new BYOD device, I find it is very limited (feels like BETA firmware issues) and would like to swap back to my BYOD. This does not appear to be possible.