While it’s efficient to do both while the walls are open, at the very least, consider repiping the pressurized water lines for safety.