I intended to replumb the whole house next summer, I guess it will be moved
up to a spring project.

If I were you I wouldnt disturb ANYTHING till the complete replumbing.

Messing with stuff like a softener may cause a cascade failure of
leaks.

Think of your water system like a badly cracked dish. even touching it
may make it fall apart