Not sure if you've had any success since it's been several days, but I had similar issues. I tried two times to no avail, but I did two things before the third try and it worked for some reason:
1). Factory reset--I had done the OTA update and thought this might remove it, but it didn't, so...