I'm not sure about you're two stage problem but rebuilding the master may or may not repair it. Aside from the rubber seals wearing master cylinders often are pitted from rust, but not always, I've rebuilt one that has lasted over 5 years now and others last less than a year. The rust problem is why BMW says to flush the brake system every year to prevent it from happening.