Sounds like you have the correct mechanism, As I said earlier in a post, I by passed my switch, (i know the pedal always returns to neutral)
I would check with your dealer on the actual adjustment, although it looks like the rear nut on the rod just prior to the switch. you need to "lengthen" the rod to make better contact with the switch..
Good luck