Hi,
I ended up taking my laptop to the Apple store and the "genius" basically copied my Library (/users/<user>/Library) to the Desktop so OS X could create a new version. Then I was able to sync my contacts and pictures and such. I also copied over some of my preferences (Firefox and the...