OK, did the pads, scratched the discs and bedded them in, rode them a while chnaged the seals and then did the hot and cold thing, they were much better. The final thing that did the trick was using them in anger on a muddy trial, after the disc and pad got so scratched and scraped they worked much better.
Back as good as new, which aint great but good enough for now.
Thanks