since the dealer will be saving the cash if you don't have him install all the stuff you will be turning around and pulling out, why not see if the dealer will install part of the upgraded system and just leave all the wiring or final connections to you?
maybe swap the valves for one extra pump?