Seems pretty obvious, get the P6T vanilla since it's cheaper and you won't be doing any OCing.
Also, I would return the 940 though and get the 920 instead.
Some people like to disable the feature so that can get lower temps and a higher OC, say from 3.8 to 4.2, effectively increasing fps some more.
Until games become multi-threaded, you will get higher fps by turning HT off.
For thermal pastes, look into OCZ Freeze and Noctua NT-H1. Use creditcard to apply thin layer.
Gentle Typhoon 1850 rpm produces 57 cfm. Should be fine with one of these or an S-Flex 1900 rpm for your TRUE, ideally with a fan controller.
Better prices? 32nm is going to be high-end, even more-so. Production costs will decrease but I doubt retail prices will lower for something that is labeled high-end.
What I'm saying is: it will be a lot cheaper for i7 owners to upgrade to 32nm. There's no arguing that. If you bought a Q9550...
Gulftown on x58 chipset in 2010+
woohoo! Glad I chose i7. Core Duo/Quad owners are screwed and will need to update mobo + cpu + mem to go 32nm. i7 owners will only need to buy a new cpu to stay on top.
AMD is dying and will need to come up with a surprise. It's roadmap isn't looking purty...