Dell XPS 410 Fan/Heatsink Upgrade Question

Recently, I purchased an Intel Q6600 processor (http://www.newegg.com/Product/Product.aspx?Item=N82E16819115017). Unfortunately, the fan/heatsink that came with it will not fit into the current setup that Dell has for the XPS 410's heatsink. Right now, I have the stock fan and heatsink, but I would really like to upgrade those two items, but have not yet been able to find anything that conforms to Dell's rig. Suggestions?

System Info:

Intel q6600(http://www.newegg.com/Product/Product.aspx?Item=N82E16819115017)

2GB RAM

750W power supply

Nvidia 8800GT vid card

Hopefully that's enough info, but please ask if you require more, as I am at work and cannot access my dxdiag at the moment. Thanks for any help.