I really like Cooler Master cases and Corsair cases, especially when it comes to their higher end models. They both offer great cooling options for both air and water. Also Lian Li makes great cases. I saw that you switched from the HAF X to the Bitfenix Shinobi though. Just thought I would throw out some other case options and ideas. Also, good call switching to the Rosewill Capstone series of PSU and maybe do some fan research if you are going to water cool you will need some good high static pressure fans for the radiators.Corsair 650DLian Li PC-A75 Full TowerNZXT Switch 810 Full Tower
The Shinobi is not a bad case at all, nor was the HAF X, but these cases are just some other quality options that allow flexibility for water cooling and expandability. Cheers.