Ok, I've ordered some Gelid Wing 12 PL fans to replace my stock fans for now, will see how they sound before thinking of going down the water-cooling road. I also found a nice looking scythe aftermarket fan and heatsink for my graphics if they prove to be making noise still. If I am happy with it I can use the money I saved on water-cooling to buy an SSD