Rebuilding these calipers is a hit and mis thing. The main cylinder rebuild is not usually a problem, it is rebuilding the handbrake area that is difficult and unlikely to be attempted. So your rebuild is likely to be short lived.
Best solution is to replace with new units and be sure to bleed your brakes every 12 months thereafter.