The calipers have been rebuilt and the rotors and pads are new. The photo of the rotor is before I did any of this recent work. I haven't driven it with the new brakes yet, because the car is currently without an engine, transmission, or rear axle as everything is getting rebuilt and we're installing a Quaife ATB diff. It will definitely get some "spirited braking", and driving, when all is back together in a couple of months.
If I've understood correctly the partial contact between pads and disc you previously had (which we've been discussing) is now irrelevant as you now have rebuilt calipers plus new pads and discs.
Would I now be correct in saying therefore the only current issue you have is the aligning of caliper to new discs which you are solving with shims between caliper and it's mount plate?