Remember that with bigger calipures and rears fitted aswell the Master cylinder may have to narrower core. May need a S2 or Mk V master cylinder.
Had a similar problem with my s1, but not as pad, just to much travel in the predal before it started to brake, was told a master cylinder with a bigger core was needed.