I too find the standard Yamaha discs to be pretty good and the calipers on my 2011 XTX are Brembo, are the discs also Brembo??? I think that standard discs plus better pads are good enough for me. I too use my XTX in the city and in all weathers so I just ordered a set of Michelin all year round tyres, said to be great in the rain and can be used even in the summer so lets see.......