HaHa so true about the aftermarket stick lucky me i found 1 the last 1 at cartoys port road fits snug i put in a new o/d switch in my ashtray works well and not out ove finger reaching distance.
P.S: just cut the wires and get a small round switch drill a hole in ashy and get 2 small spade connectors and there ur O/D switch i can show you how ive done mine if ur in Adelaide or ill tyr to get sme pics uploaded if i get a new camera soon?
just pull it up r u certain u got both screws if u can lift just enough till u see the wires then cut em then it should come straight off mine was easy az!
just take ur time and be patient good luck mate!