In my opinion, what you should get is this - http://pcpartpicker.com/p/ZxkX7P
Going in order (only the changes):
- good i5 for overclocking - you already have water cooling
- much better, faster and more reliable storage
- a GTX 980 that is a much better choice (if you need a reason here you go...