Chris, I suppose I'll try Intel's stock cooler first, but I wasn't impressed at all with the one that came with my Q9650. It was quite a bit louder than the Zalman that replaced it. Thanks for the tip on the thermal compound.
That's what I'd do. Not worry about finding an aftermarket to fit right away. See how you like the factory model. That'll also give you time to track down one that fits, and have first hand measurements of how much space you have to work with.
Get some AcrtiClean too, that'll make clean up after removing any heatsink much easier.
Got my release version of Win7 up and running today. Only took 6 hours to get the machine to have enough software installed to be usable. You know I have over 10,000 photos which take up 27 GB?
