Im looking into the 790i right now- I have a 780i and its got a dead pciE port

I bought another 8800 ultra two days ago for cheap- to add to my 2 that i have now. And im goign to be RMA'ng the 780i but ill prob sell that off that comes back and buy a 790i and ddr3 ram.

Im looking into getting a DDR3-1600 2X2GB kit.

I am watercooling so am i better off buying a EVGA 780i and a waterblock (100 bucks extra and 339 for the evga)
Or the S2E for round 450?
Does the S2E WC block go to the SB and NB?