My laptop, which is my only computer, is going to get 'upgraded' (2gig more RAM and Windose 7) and I was wondering if there is anything else I should be upgrading at the same time. At the moment I am thinking a new bigger HDD might be a good idea. It also tends to run a bit hotter then it used to, so is there some way of making it run cooler with bigger or more efficient fans (a good clean will probably be a good start).

Currently it has an Intel Core 2 Duo T7500 @ 2.2Ghz processor and 3GB RAM and is running Vista Home Premium. Graphics card is an NVIDIA GeForce 8400M GS. The computer is about 2 years old and I will hopefully keep it for at least another 2 years.