Try upgrading from recovery mode (hold menu then power on). ISTR there's an "erase everything" tickbox in the upgrader?

That should probably fix it - it sounds like something in a state file has got borked. You'll lose the content from there unless you copy it off first (obviously)

Hugo