That what I was thinking originally but I just got the whole system so I don't really want to change the board or anything. I was however, looking at getting either the i7 980x or the Xeon X5650.
For some reason I was thinking that getting the AIO and overclocking higher would be a better way to go then the new CPU but the more I think about it, getting a new CPU might not be a bad idea.