I fought leaks on mine for a while also. I found the wire bail was not bent evenly and putting less pressure on one end. Tweaking the bail fixed it.
If you want to run the newer style master with screw tops, Dr Diff sells an adapter plate for the 4 bolt booster. It may work with the master you have or he'll sell you a compatible new one.
Just curious if i use the adapter plate what do i need to do to make up the difference lost in the push rod?
I believe Dr Diff has matched up the master and plate to be compatible. You could call him and ask. I would personally go with his matched pair plate + master. It should work fine with a disc/drum setup for normal driving.
On the rear, unlike the front, there is no way to bolt up factory parts to set up discs. There are a number of kits to retrofit. I ran disc/drum for many years until I pushed it hard on a road course and burnt up the drums. A Dr Diff rear disc kit is installed now and no more burning brakes on the track.