Thank God for that...

Everything appears to be back up and running. Or at least those bits I actually care about. I still need to sort out things like the webcam and the soundcard (which was the main reason for trying the upgrade in the first place, *mutter*) but mail works and so do ssh and ftp, which are the important bits from my perspective. With those running I can easily fix the rest from wherever I am. Hurrah.