Audi A6 (C5) New Discs & Pads - What to get (Upgrade)

[OrangeBob55]

I need new discs and pads for my 2004 A6 (C5). It's a 1.9 tdi saloon (if that makes any difference!?)...

I have had OEM discs and pads, which had horrible fade when used hard, and recently have had EBC Green Stuff pads on the OEM discs, but they don't really offer much better performance to OEM pads.

Anyone recommend any good disc and pad upgrade options (keeping standard calipers)? or OEM discs with any other pads recommended?

I am after something that bites well when cold, but with good resistance to fade in spirited driving.