I think I may have found the problem. The Sata hdd that seems to have gone faulty was still connected. Once I had taken that out and fully updated Windows it now takes about 20 seconds sitting on the loading Windows screen, still a bit longer than I thought it would be but a lot better than before.