If you have clients with SP4 installed on their workstations, you can choose a default action for when the clients local profile is newer than the server based profile. Browse to:
Add Value name ChooseProfileDefault as a type REG_DWORD. Setting it to 0 will use the local newer profile
(without prompting if ProfileDlgTimeOut is set to 0). Setting it to 1 will download the server based profile.