As said above. If you are that cautious about the CAI and water, just get a short ram. That is what I did. I put in an Injen SRI but they do make the CAI extension if I want it. SRI's are even easier to put in. The hardest part about it was taking out the stock parts. You aren't going to get a lot out of either an SRI or CAI by themselves. So IMO, go with an SRI for now and make sure the company you buy from has an extension you can attach later on when you feel more comfortable.

Good luck on your choice.