I ended up getting the KSport Discs and calipers with the YellowStuff pads.
It took about 1000miles to bed them in, lots of grumbling noises until then. Well worth the wait though, the bite on them is excellent, miles better than the stock caliper/discs, it really does stop on s sixpence so I am well happy with this setup, for price and performance they are really good.
Needless to say the steering wobble has gone and they feel like they could stop a steam train.....

Take a look at these beauties....
