Both. Results were similar. But in the end I will work on the machine with a fresh install and put Windows 7 on my old machine.

Migrating was painless, except for finding enough disk space on an external drive to move all my somewhat disorganized and sprawling file hierarchy.