You could save yourself a lot of headache trying to troubleshoot and fix your old, outdated system and control your pump with the IDX MX-8 controller like suggested earlier. You could eliminate the expansion tank, the pressure switch, and having the system pressurized all the time. With the IDX, the pump ONLY runs when the rotary switch calls for PS. Surely you have a terminal block you can wire into? You don’t have to rewire your solenoids. For a 4 bay, you only need 5 wires for input to the IDX, 4 hot 24v wires (one from each bay) and one common. Then interrupt the 120v hot wire powering the motor. (120v input and output on IDX, its just a relay)…Simple...And effective. You're going to spend more money throwing parts blindly at what you have.
Do you know the P/N for the Fluid O Tech you ended up with? Some of them have a Pressure adjustable bypassing valve built in. Some do not have this. If you have one that DOES NOT have the built in regulator, you’ll need an external regulator like Randy suggested. Then you would bypass back to the tank.