Umm.. flu, you should have used Linux to image the drive when you did the ‘upgrade’. This way if it craps out, you can restore the image. Best to do one right before the upgrade and one right after. The Linux imaging tools only backup/archive used blocks and leave the freelist alone.
You can use a CD/DVD based Linux bootable to do it, writing the image to a removable USB drive (or visa versa).