Not only did I recover the drive, but the annoying problem that was the reason for the upgrade is gone. (It took about 40s to recognise a blank.)

Major, major thanks!