i have 2 complete cp 31 setups also, and can help if need be. Let us know how the pump issues work out.