Currently. Very big word. As is, that h60 should handle that just fine, but you seem to be doing some decently heavy thread work. Now. Which raises the question. Will you OC? You can't ever over-cool a cpu, so having access to a huge monstrosity of a cooler, just in case, won't hurt in the slightest, but as you are finding out, you can most definitely under-cool a cpu.
The H7 isn't that much different from your current aio, both @140w capability. The H5 is @180w. The R1 @250w. Right now, your cpu peaks @150w, so can be pushed beyond reasonable temps, but just how far will you go? The H5 would be good for right now. Add some OC and you'll be right back in the same boat you are in now, higher temps, and wishing you had spent a...