Bud,
If water is getting into the battery compartment, you have narrowed down  the 
cause of one of your leaks.
In my boat, the battery compartment is sealed from the bilge, if I remember  
correctly. This would prevent any water that might come out of the water tank  
from getting to the bilge.
 
Rummy