I upgraded my shift knob twice.
First from stock to the OEM sport shifter (has same dimensions as the M-Sport shifter but with Aluminum instead of the perforated leather):
Since I upgraded to the M3 steering wheel I needed another shifter to match and this is what I have now (F10 M5 shift knob):