TBH,I would wait until Diablo 3 is out to get a good indication of what hardware you need!
Have you tried overclocking your Q6600?
Regarding the Core i5 CPUs at 4GHZ,I suspect if you are keeping it for three years or so,there should be no problems,but
TBH no one can really tell I suppose and
IMHO the voltages used are the more important factor. If sane voltages are used and the CPU is kept cool generally you should not have issues for a few years.
If you get you own parts,you could always get an overclocking capable CPU and motherboard and overclock the CPU later down the line when you need to.
Of course going with non-overclocking capable parts will mean lower initial costs,although overclocking will extend the usable performance of the CPU.