B&M Hammer - Console mods
I basically did your first option with my B&M Quicksilver shifter.
Print