Currently my T60p 2007-9EU (2GB RAM, Hitachi 100GB 7200 SATA + , WinXP SP2) has T2700 Core Duo CPU and two hard drives (one in UltraSlim bay). Before I installed Notebook Hardware Control the system often powered down on itself because of overheating - the regular temp was in higher 70s - lower 80s and that's with only Outlook/Miranda/Firefox running. Whenever I fired up something more resource hungry (Photoshop, Visual Studio) or launched some disk-spinning activity (like backup) the temperature becomes prohibitive and my laptop just shuts down. Now I am running on (mostly) reduced frequency (NHC shows 1GHz) which kind of defeats the whole purpose of having a T60 instead of T23 or T42 I had before
In addition to this - I was hoping to upgrade the CPU to Core2Duo T7400 or even T7600 in a couple of months or so. Here's the tricky questions: should I send the laptop for repairs (warranty is still good) now risking that repairs won't be effective once I swap the CPU, or just make the change hoping that the cause of overheating is loose heatsink (as it was the case often pointed out here on forums). This way while upgrading the CPU I may as well fix the heatsink myself.
What does the collective knowledge suggest? I'm pretty set for an upgrade (since I am usually running several large tasks at the same time and can use a faster machine) but the investment will not be justified if I will have to downplay the CPU again.
Any input will be highly appreciated
Update: motherboard info as per CPU-Z
Chipset: i945PM, Rev. 03
BIOS: 79ETC1WW (2.01)




