updating icloud on mbp with new email address

i changed my email address and have updated it on the apple discussion website, itunes, apple store.

the only problem is with icloud on my macbook pro, which only gives me the option to sign in with my old email address. everything on the account window is unchecked except keychain (which i don't remember signing up for, but it is greyed out, as with the rest of the entries).

i tried to delete my icloud account using the instructions here <icloud email address changed>, but it tells me to "Turn off all iCloud services and try again." everything i can think of that uses icloud is closed.

i created another account using my new email address but that doesn't allow me to use calendar on my mbp.

please help.