Personally I'd swap in hanging pedals from any '72 or newer CJ and go with a dual master cylinder on the firewall out of a '78 or newer CJ with front disc brakes. It's not a bolt on by any means, so possibilty all depends on your fabrication skills or willingness to pay for someone else to do it.

Safety goes up and you can also get rid of the cheesy clutch linkage at the same time.