I don't think ditching one company that provides data to the NSA (assuming that's why the OP is leaving) for another that does the same thing is helpful.
You may have missed the part where he said he was looking at Dropbox (which you may remember as being widely reported being mentioned in PRISM slides as "coming soon").
So, I think the assumption that he is trying to dodge the NSA is a bad one.
Sorry. Yes, iCloud is not an option for me. I want to have my calendar and not let any big company have my data. As some of you have correctly assumed.