On the subject of a replacement PC, I recommend Dell Outlet. I managed to get a Dell Mobile Workstation M3510 with quad core i5-6440hq, 256GB M2 SSD, 16GB Ram, large battery, W10 Pro, nice full HD display, backlit keyboard, lots of ports, dedicated graphics for £568+VAT. Not the prettiest but great build quality, solid as a rock and eats whatever I throw at it. I've since added a 256GB M2 drive in the modem slot and replaced the SSD with a 512GB NVME. If you keep looking, you can get very high powered machines at good prices.