If your domain is running fine and you don't have any unsupported charters in any names I would just upgrade the domain. I used the migration tool in a lab and it worked fine for users. I did not get ...