Sorry for the extra post, but you might miss an edit.

Save yourself some grief--if you do go the Repair Install route, you'll have a second, new set of Documents folders (My Pictures, My Videos, etc.) and if you don't consolidate them immediately you'll have a terrible time sorting them all out later. If there's a trick to avoid this, I'd love to know about it.