We have a new Avondale Argente 650-6, which is fitted as standard with a sureflo water pump, which is much more, efficient regarding water flow rates. The only draw back is a slight noise inside the van. Maybe worth you having a look at the water system inside a show van, the pump and tank are located under the front off side bench seat.