I decided to go with the simple one big partition setup. The reason I used so many partitions is because my laptop was a proof-of-concept for a server and I'd figured I'd set it up as such. The partition setup was recommend to me.

Now that I've been thinking, the only things I have to worry about losing if I would be an upgrade (or new install) would my apache config and samba config which I'll just back up. All my personal data is stored on other hard drives, actually in Fat32 so I can share it with Windows.

Thanks for the help.

Andy