THAT should do 'er, jon, but i'd clean the mc and poke a small wire through the smaller of the 2 holes (and see if that helps) b4 rebuilding calipers. DON'T neglect to clean and re-grease the slider pins..... Remember that neither front nor rear fluid reservoirs should be 100% full; you need some room for expansion. HOW many kms on your bike?
When you say poke a small wire through the smaller of the 2 holes are you referring to in the master cylinder? Ill pull both calipers, clean exterior with brake clean then grease the the slider pins. Id rather stay away from rebuilding the calipers if at all possible. Bike has just under 47 000km on it.