iPhone locking up on sync-syncing Calendars

I have had my iPhone since launch day with no problems at all until now. I changed some of my email settings to iMap on my mac since I'm changing to a new server. I then put my iPhone in to sync and it started off fine syncing contacts and then locked up while syncing the calendar. I thought it was just taking awhile but in the morning it was still doing the same. I then chose to do a complete restore of my iPhone and then had the same problem. Next I did another restore and even rebooted my computer but the same problem. I have no clue how I can get this to work and have no idea why changing email would do this. Any idea how I can fix this and do a complete sync?