Key Ignition Solenoid '96 4Runner

I have been experiencing the key getting stuck in the ignition (ACC position) of my 1996 Toyota 4Runner. I've narrowed it down to the problem either being 1) a switch in the shifter assembly that tells the ignition the truck is in Park or 2) a component in the ignition (a solenoid) that allows the key to be released if the Park switch is pushed. I currently have the solenoid disconnected and the key comes out. Would that mean that the problem is with the solenoid or could the problem be the switch in the shifter assembly?

The switch fails more than the solenoid.