Re: batteries running down too fast
Is there a current rating on the motor?
Does the actual current match? (in the water, at full speed). How does it compare with the amp-hours of the batteries?
You may have to beg/borrow/steal a DC ammeter to put in series with it.