I'm glad you got it working to your satisfaction. All this because one valve was leaking! I rather liked the original configuration, from one panel of 5 clearly marked valves you had all the functions of the water system by following illustrated valve settings.
By the way, a spray bottle of bleach water loses it's effectiveness as a germ killer in short order. A solution of 1/2 teaspoon per gallon is adequate for disinfection, but it also is suggested it be tossed out at the end of the day.
I hope that if you tackle your electric service as a project, you don't start by cutting out the breaker panel and starting new!