It would be better if your gravity tanks (Soap and water) were at least as high as the pumps. Cat 310s specify the supply must be "flooded," basically the tank high enough that water will free-flow into the pump.
How are soap and wax supplied now? Is there not a tank compartment for water? Does it draw HP soap from the presoak tank or is there another supply?