It might be worth considering going to a pressurised system, provided the taps do seal properly when closed, then fitting a pressure switch and non return valve (most caravan pressure switches have a never built in) to the pump outflow simplifies the system and provides a higher current rated single switch that will handle a more powerful pump.
You could also consider an onboard diaphragm pump, which has both pressure switch and never built in. The down side is they are noiser than the comet type pump, and can cause vibration which can be amplified buy the caravan body which can be annoying.