I think I'll give up on repairing my install and instead mount the encrypted partition in the liveCD, copy the home folder, make a clean install and copy home onto the new system.
Not sure if I keep ubuntu.