Here is a picture top switch is passenger bottom is driver - no real difference. I forget which side the lock is from but no groove just a bit shiny where the switch would run. I have the other side and that one shows the same wear - no groove. In fact the only difference between the two lock assemblies is where the switch cam is, on one side it will engage the switch earlier in one direction. However that should not even matter as you need to do close to a full turn to engage the lock mechanism. So you could probably swap the entire lock assembly again the only change needs to be a rewiring of the switch. In playing around with the old ones now it looks like the driver switch itself could be a bit worn or loose, as it engages better if you hold it down when you turn the key. perhaps a couple wraps of electrical tape would also work.
There is no real way to pull apart the switch housing - it is a Kissling switch, quick google indicates they are Swiss. Also the connector is an overmold so that does not look productive method to get at the wires.