Just throwing it out there as an option. The E8400 CPU is rather painless to overclock up to 3,8-4GHz with an aftermarket cooler, probably 3,2-3,3GHz with stock. If you could invest on a new cooler like hyper 212+ (around 30€ / 270SEK) it would allow you to greatly increase the potential of your E8400, and, be (most likely) usefull in your new build as the hyper 212+ supports 1155 socket too (sandy bridge and the upcoming ivy bridge).