don't worry too much about hydrolocking if you live in an area with a lot of rain. if you drive with common sense and don't drive thru a puddle a CAI will be safe. a CAI will give you a little more hp in the upper RPMs while the short ram will give you a little bit lower range power. they both sound nice when you stomp on the gas and its a fun mod, if its your first mod. I've had my CAI on for almost 4 years without a problem. if you are eventually looking for some serious hp gains save up for a turbo, or a nitrious kit.
I also agree with carnut21, AEM and Injen intakes are both great products.