I should add, that I would stick to AMD but it seems that Intel is ahead in the OC game at the moment. Of course I could be wrong. I haven't been following it that closely.
Also, I am building this new machine as a hobby. I don't NEED it but it's something I've been wanting to get into for years (Water Cooling & OC'ing). I get asked a lot why I am building this