Thanks VanDer, yeah will give the disks another go this weekend.
Also while changing my break pads, I discovered one of my slide pins was stuck, (was planning to anyway) but took both out, cleaned and greased them and went back in like new and the difference in the drive, a lot less noise and vibration, I knew it would make a difference but still surprised at how dramatic a difference it made.