+1 John V, the 997/987 short shifter is an excellent add-on that keeps your ride under warranty and gives it a shorter, firmer feel that I enjoy. In some regards, it feels I think something similar to my old Triumph.
Cheers and good luck with whatever you go for.