Going back to stock height from 2 1/2" drop spindles?

[ochre70]

Been thinking about putting the truck back to stock height a lot lately. Just want to get an idea of what I'm looking at. So here's the story... The truck came with drop spindles and springs. I have since put stock height springs in the front and 1 inch taller ECE springs in the back (which look more like 3 inch taller springs to me). I am still not crazy about the ride and I still have issues with rubbing the front inner fenders on big bumps (taller springs + skinnier wheels = better but not perfect). So here's my question: Does anyone know if I can use the CPP rotors and calipers and just swap out the spindles for some factory 71-72 spindles? Will I be better off finding the rotors and calipers also? Here is a before and after of the truck for reference.