Boydster
Don't get stuck thinking you have to stay with the Onan pumps. The freshwater circulation pump is a pedestal Oberdorfer and you can buy a repair kit or new pump online very reasonably.
The overpriced gear driven Onan raw water pump on the side of the engine, that continually fails can be easily replaced with any belt driven pedestal 3/8" pump. Takes a little engineering but is very simple, not very expensive and works great. And your pump problems will be a thing of the past. You do have to make a cover plate to seal off the old Onan pump power take off.
The heat exchanger is available from "The Manifold Warehouse", Vancouver, BC (They're known as Sea Camp her in the States.)
Rebuilt mine last Spring and it runs like a champ!!
Larry B.