2002 Shifter Lock Out

Having trouble with the Shifter lock out on a 2002 Tacoma...

Solenoid and Switch work but it doesn't seen to fit right.

If Shifter is pulled back from the Park position it can pass between
the Switch and the Detent for Park/Reverse. If it operates normally,
it depresses the Switch but doesn't catch Switch on the way back to
Park unless Shifter Button is depressed all the way. If not depressed
it slips between the Switch and doesn't return switch to the position to
release the Key.

Any help would be appreciated...

Thanks.