if the funds allow it replace the calipers, they were always a weak point on classics even with uprated pads and discs
id look at prodrive alcons if you can find a set though theyre pricey for discs, ksport 8 pot setup, newage brembo's with adapter kit for classics - all value for money options with low maintenance and big performance