If the Alt. is charging at 16-17 volts means the regulator is bad. It is probably boiling the battery off. Basically frying the bugger. Not too good. I would look into a new battery and watch the current. And like you said, the water getting in is probably not helping.