check with Moranor for the Textar pads to fit your M3.... They have been great on my M so far and i know all the other guys that chose to go with aftermarket pads went the textar route.
I would recommend changing the sensor, it's relatively cheap and rather be done while you have everything open. They are know to give issues once reused, which means removing and refitting everything again
just to add a new sensor.