Thanks everyone for your help.

It all seems to be working now, and I haven't lost any data, so aside from a wasted morning, it's all sorted.

I've been using MemoToo to synchronise the calendar and contacts, so whatever happens to the phone I shouldn't lose them