The CM690 II Advanced has very good water cooling ability as is... there are two spots that rads can be placed; a dual rad at the bottom if you remove the HDD bay, and the top has space for a 240mm rad + fan space. So your current case has very good self contained water cooling capability, and it has two grommets at the back for better water coolers. The Haf-X has three grommets on the back panel for another loop.
Up to you and what liquid coolers you're looking for, but personally i'd just stick with the 690-II Advanced