So I have been taking old case fans I have lying around and removed some from the old CM 690 II case, and the temps haven't really budged. I think I am just going to go with a new CPU cooler. The Corsair H100i is on sale at Tiger Direct for $90 shiped after rebate, seems to be a good price.
The Noctua NH-D14 is a flat $78 shipped from Amazon with Prime.
Which do I go for? I kind of like the Corsair, but the Noctua is a little cheaper and seems to perform just as well, $20 less. The added benefit of the Corsair is that I don't have to buy fans for the top since I believe it mounts up there.