I would rebuild what you have and add a vacuum booster to improve the feel. There's not a lot out there for the bigger trucks and the booster and a dual res. master is what I did on my 1 1/2 ton. Now I can actually get the brakes to lock-up with a load on if I so desire.
Welcome to the 'Bolt neighbor,
Scott