A quick thank-you to everyone who replied! Given the number of variables, I think my strategy will be to make it easier to rebuild the entire system from backups. This way, I can build a new machine with filesystems that better represent my actual usage, then just dump an image of the filesystem on top of the new hierarchy.
Take care, and have a great holiday everyone.
