What time period was 30k km back?
personally, i probably would because I like getting things back to a baseline but I would probably do it this way:
1) DIY brakes & rotors including replacing the slider rubbers on the front calipers and a full external clean of everything
2) Bed in brakes and drive on them for a month (just to get an idea of how much of an improvement the pads rotors are by themselves).
3) replace brake fluid with the proper Low Viscosity dot4 and include cycling the ABS pump as part of the process.