Swapped out my stock shifter for a Billetworkz CVT adaptor and MR2Heaven weighted leather knob. Ended up having to remove some material from the lower side of the knob to allow the lockout to function properly. Also wrapped the shifter trim bezel in carbon fiber, which IMO looks significantly better than the overlay I was using previously.