Mechanical Fuel pump on Moggie Current engine, haven't done research on it, if leakage is the only problem on your current fuel pump then I would recommend to hunt the repair kit from ESM and you pump will be back in service for another 40 years 
Yes restoring the stock brakes to original glory needs time and lots of kharcha (I am referring to to install brand new wheel and master cylinders). Disk brakes is the best substitute - Go for it!