I've taken apart the computer and given it a good clean out, reapplied the thermal grease, etc. I've also tidied all the cables up so that there's less obstruction.
I also bought the new RAM and Hard Drive I've been wating to get for a while now, so I'm currently reinstalling on the new hard drive. I'll post back with how the performance is, but so far so good!