Thanks for the suggestions guys!

Looking at the exact same heatsink as the CM Hyper 212+ so hopefully will take care of things. Hope your GPU issues come to a resolve as well.

As far as water cooling, cant dish out that much yet haha.