I would stay with the CJ stuff instead of converting to the YJ stuff. The reason is that CJ is GM stuff meaning that a 77-81 Corvette MC bolts on to the stock CJ booster (no rod modifications needed) if you ever go to 4 wheel discs. There are options using the Ford based YJ boster but IMO the Vette MCs are the way to go. If you upgrade to 3/4 or 1 ton axles and keep the rear drums, a MC from a Chevy truck will swap in with no modifications. If you need more boost (not likely if the rest of the system is optimized) A GM duel diaphram booster is an easy swap. If starting from scratch look for a duel diaphram booser from a S10 blazer and a MC to match your current calipers.