I know the bolt you are talking about, I don't remember having to remove that to pull the switch, Unless it was to get the whole assembly to rotate to remove the switch? Anyways I don't remember a cap/bolt that held the switch in. Did you take pictures?

That bolt is the one with the weird "keyhole-looking" head, right???

I could always get those 2 plastic pins to press in one at a time. I pressed in one, while holding a little pressure on the switch (away from the lock assembly) and it would usually stay in long enough for me to press the other one in and it would come out, better than try to press in both at once while trying to push the switch out with your 3rd hand.

__________________
Click here to see the items I have up for auction at EBay

Click here to see a photo album of my '62 Sprite Project Moneypit (Now Sold)