If you have the money look into a DPR head...Dan Paramore Racing, sorry no link but im sure it's out there. Also look for The Old One...part of the energy dynamics page.
http://www.theoldone.com/
From what Ive read water injection has limited uses, a better set up maybe be the Nitrous...