Not sure what to upgrade 212+ to.

1| for watercooling you may want to hold that thought and go for a real loop instead of shelling out on a unit that performs on par with an air cooler. The range can easily be bridged with a cheap air cooler.
2| Nothing beats a Noctua NH D14 or the silver arrow, so you know your bar has been set with these two coolers.

My 2 cents mate.

If you're interested in watercooling might want to:
1| go over the watercooling sticky in my sig
2| go over the watercooling gallery and build logs thread for some inspiration on layouts and the absolute last advice is taking time to read through the sticky. All the answers are there.

Noctua NH D14 or Phanteks PH-TC14PE < I own both of these Air coolers and they perform very well.

What one are you using on your build now? If you have pretty good temps with the OC you have I'd probably get one of the 2.

Noctua NH-D14 is on my intel build 3750k at 4.6 ghz.\1.28 volts

Temps?

75 TO 77 Degrees.

Wow I have mine at 4ghz at a offset of -0.070 and I get about 58-62C is the highest I've seen it go. I think I might be looking into picking up the noctua. I see it has the 120 and 140 fan on it, should I pick up another 120 or 140 to fill the last spot?

With great advice from 4ryan i changed my fans to Scythe Slipstream 120 mm. 1900 rpm \ 110 cfm.Knocked off 3 to 4 degrees from stock fans.

I wonder if the SP120's from corsair will have a similar result...? Ryan is a really valuable source of knowledge for me as well! To call the guy a workaholic would be an understatement  

@ OP - SR-71's got the BA vote  

* you may want to look up Ryan's cooling fans roundup thread here

Damn, they seem to be discontinued on newegg. What about SP120's from corsair?

http://www.amazon.com/Scythe-Kaze-Jyuni-SY1225SL12SH-12...

Here ^