[rivviepop]

My solution is two part - make /home/ it's own partition, and keep everything in my home directory. All my upgrades simply wipe out all other partitions except home, and I backup home to USB hard drives.