The battle continues. I've given up on repair. Now we get a new hard drive, set the infected one as slave and do manual data transfer. Fun.