OK - so now I've rulled out the PSU, the new memory and the hard drive (cloned the hybrid onto a normal SATA drive). On further googling, this looks like a windows 7 problem! I suspect it's the old wifi card I have installed, so will try ripping that out later...