So I deleted everything and re-ran the updates. Finished installing and it has now let me log in.
I've re-downloaded the HW update and it says it's going to take about an hour to download. Earlier it only took a few minutes.
I think perhaps the problem was with the original download not completing correctly. I'm able to log in and play at least, I'll update again once the HW download has downloaded and installed