I'm using a Treo 650 with the included Hotsync to syncronize my calendar and contacs. I have problems with some entries getting duplicated from time to time, so I'm looking for a better solution.

Requirements are:
Contacts: Sync of picture (Palm Hotsync does that)
Calendar: Sync of label with color (not working with Palm Hotsync)
Both: Good conflict management

Any suggestions?