I happen to be going through the exact same thing right now. I have an old JB pump on a 20ft Eliminator that was not only making noise, but was leaking terribly. I removed the whole unit and found no gaskets on any mating surfaces at all. Anyway, I researched between Berkeley and Legend and decided to buy the rebuild from Berkeley. They are reasonably priced, provide you with everything you need with different packages available. Berkeley is still local (Rohnert Park), which allows you to get the parts relatively quick. However, if you can afford to get a whole new unit, well....