Nofear - as Case said, that will be causing the issue :-( You either need to hard reset your phone, OR change your e-mail address back to googlemail.com :-( (As far as I'm aware these are the only 2 options, although I *think* - don't quote me on it!!! Google are looking at a fix?!)
The "clear data" route didn't work for me - but I'd already set up my gmail account as my second google mail account. After clearing it didn't go into the wizard but just gave me a choice of which account I wanted to use. Curses?
So now -factory reset or wait for google to find a fix?