Oh, I just realised I've already tried testdisk. I'll give gpart a go.