Just a final update on my question about the beta and new device, so I skipped as much setup as possible, turned on beta in settings and it immediately offered without having to do the old way of registering on the site. Once that was done, reset and did the scan the device type setup which then worked perfect. Near the end of that it just asked me to confirm if I wanted to keep the device on the beta track.
Oh okay. Sweeeeeet! When I get my new device, I will indeed follow the same route. Thanks for the follow-up. It’s much appreciated.