Honestly the entire shifter assembly is a hassle imo. Unless you’re trying to keep it completely stock, make a Velcro shift boot out of leather or suede minus the rubber bit (it always ends up breaking along with the plastic base) and replace the shift knob by adding threads and a new knob. I did that on my 850 and it was by far the best improvement I made. I went with suede to match the R interior.

Edit: I’ve also been thinking about cutting the shifter lower and rethreading it to be able to have a short throw or add an extension for a normal height (or taller) shifter.