djg,
You did all the upgrades I would have done in your shoes. Good job.
How did you upgrade your brakes? There is not much you can do that doesn't cost an arm and a leg, and doesn't involve major and wholesale replacement of the braking system. I have experience going to complete disc brakes on my CJ8 (Chevy front and Cadillac rear) and found every part of the system is connected and tuned to the rest of the system. Smaller hoses and lines for more pressure? A bigger brake booster? Larger rotors and calipers?
It would be enlightening for the TC community to hear what you did to upgrade your brakes. Braking is the often overlooked 'stop' aspect of hauling around a 10k pound white box on a pickup: as opposed to the often overrated 'go' aspect of a 10k pound camper.