My Eris just updated to 2.1 (I was going to do it manually, but this morning it told me that an update was available and it did the official OTA process).
Anyway, the official OTA process doesn't ask you how you want your email and contacts synced... apparently using the account info already on...