Last night while motoring to a waterfront restaurant for dinner, I noticed the bilge pump kick on more than once. Boat is normally dry below, so I knew something was wrong. Went down below and had water on the sole in the Galley running from under the cabinet in the sink area. First fear was sink drain thru hull, but that looked good and was dry. Then however, I looked further back in the sink cabinet to where the water heater lives in the front end of the starboard lazarette. Water was dripping out of the bottom of the heater. I checked the hoses and connections, and they were fine. So I think the heat exchanger in the HW Heater has failed, and since I have a Yanmar 2GM20, I am leaking Raw water engine coolant into my bilge. I need to buy a Barb fitting, and bypass the heater ASAP. and then I need to decide If I am going to replace it, and if so with what. The raw water heat exchanger never did anything to heat water in the water tank, so what small heater would you suggest to replace it without a heat exchanger?