CPU upgrade for XPS 630i

I have a XPS 630i and I have been very happy with it and I’ve had no problems other than controlling the speed of the fans. It’s my understanding that this motherboard is based on the 650i so the Intel Core 2 Quad Q9650 3.0GHz should work just fine in place of the Intel Core 2 Duo E8400 that I’m currently using, is that correct?

If so, the only roadblock I see is figuring out how to remove the massive heat sink that now sets atop my E8400. Will that same heat sink be fine for cooling the Q9650 if ran at the stock speed? Will I need to find a way to run the fans any faster to keep the Q9650 at a nice temp? My PC sets atop a large open desk so there is airflow from all sides and I keep the room fairly cool at all times.

Thanks in advance for any help you can provide; I’ve had trouble getting a straight answer will the Q9650 work and how to remove the heat sink.

Kevin