I’ve had similar things happen. I think Apple may have addressed this, but my standard way of dealing with it now is to set the new device up as a new device, update the OS, wipe the device, and set it up with the migration procedure. It’s a pain, but it works.