I have this same issue (like every time - not once has it connected the first time) and have done one of the two things and so far it has resolved the issue. In...
I often find when the Update button just spins and spins or it's not updating even when the update button thinks it's done that logging out, waiting a few minut...
