I can't really speak much on the repair front specifically. As for reinstalling, I would recommend (if you haven't already) making sure to partition your hard drive in a way that allows you to put your home directory on a different partition than root.
My own personal setup is as follows (~60gb HD):
Partition #1: ~16gb (primary partition, used for root).
Partition #2: All the rest (logical partition, I think is what it is).
Partition #2.1: 1gb (swap).
Partition #2.2: All the rest (home).
Using this setup, if I have to reinstall for some reason, I can opt to just reuse my old home directory. I get to keep all my old settings and documents, and it makes the whole process a little easier. If you should happen to have to reinstall, you may want to consider a similar partition setup.