I've decided to scrap the file/partition recovery and just revert to my old backups, as all I will have really lost are recent programme downloads, ISOs, some videos/MP3s which are easy to get again and some scanned photos which I still have the negatives for.