I figured it out by accident.
I kept trying a bunch of settings on the TP2 and all of a sudden it started to sync. When I opened my gmail the contacts were all there - all had duplicates too.
Fortunately gmail has a great duplicate fixer and it took care of them quickly. When I synced the Droid X everything came over just fine.
Thanks for the help, my next step was going to be the csv route.