Yep, that's the one. Arrived today, but I haven't put it on yet.
Just want to say thanks to everyone for your help. I ended up disconnecting the fan after all, leaving the heatsink on, and it didn't seem to get hot at all (although I'll replace the heatsink with the Zalman one anyway). Thanks...