Well my laptop is now fixed, the motherboard needed to be replaced. The good news is that it has returned from HP with the original hard drive in it, there was a bit of a question mark over this as there is a hard drive fault that normally gets sorted (by lobbing a new one in) when one of these models goes back to it's maker.

I should be able to update more frequently from now on.