The fronts are Black Diamond Cross drilled with Ds Performance pads.
I have had a good look at the discs today and they appear (with an ooooooold vernier guage) to be okay only 0.8mm below standard spec, and they run true. I think I'll have a go with just replacing the pads with DS performance ones to match the front.
Might also paint the calipers silver or black. That'd stop them looking quite so dirty all the time!