Yeah, luckily I kept a back up partition which I did just a few days ago. So I booted to that and mounted the old partition and just copied it over, everything is happy again

I think what I need to do is actually update X.org which was the step that seemed to be failing when trying to build the various part of the DRI drivers.