Don't overlook the old "get rid of the mechanical pump" alternative. If all else fails, an electric pump mounted near the tank, with a filter inline, and a blockoff for the old mounting on the...