That was a long question Skip!

Anyway, faced with same problem (rusty leaking Raritan) I switched to an all
stainless water heater by Quick. No problems with installation or use so far
and price was less than a Raritan , I think....

My Raritan had been installed before the deck went on, so had to be cut up
in place in order to get it out! The Quick unit fitted through the cockpit
locker.

These are made in a variety of sizes and shapes, are well made and look
good!

In the USA, this is the contact info:

Quick USA LLC
Street: 509, McCormick Drive
City: 21061 Glen Burnie, Maryland
Region/Country: U.S.A
Telephone: +1.410.768.5991
Fax: +1.410.768.5995
Mail-to:
http:// www.quickusa.com
First contact: Daniele Rizzo


In Canada:

Vredband Imports Inc.
Street: 1855 A. Industrial Blvd
City: LAVAL - Quebec
Region/Country: CANADA
Telephone: +1 450 6683111
Fax: +1 450 6686270
Mail-to:
http:// www.vredband.com
First contact: Stephan Bisson