Got the replacement CPU from intel today, dropped it in and all is working. I tried to overclock it (from 2.8 to 3ghz) but it wasn't happy - the issue may have been with the RAM, I'm not sure. I may try to tweak that again. Here's hoping I don't have to open the computer again until I get a SSD.