Bigger rotors and adapters would be a worthwhile upgrade. They give you more braking force, and more surface area means they last longer, and dissipate heat better. Pad performance varies greatly. I prefer SwissStop pads and rotors, they are longer lasting than the Shimano components I formerly used, and are easily obtainable on Amazon.