Only change I would make is to get the Swiftech XT. The main reason why is that you plan to upgrade soon and it performs the same the HK. It includes backplates for socket 1156/1366. A quick e-mail to Michelle over at Swiftech will net you the 775 backplate for free. (At least I think it still free). This will save you about $20.

I just hope Gabe gets the quality control issue fixed here soon.

There is an adapter out there that will allow you to hook the fill port up to the XSPC res directly. NCIX might have it, if Direct Canada doesn't