I can verify (at least with a 965) that the PNP switch can be removed as described in the FAQ without removing anything. It looks tricky, but once the bolt and nut are off I was able to slide it off the shaft (neutral) and maneuver it around the two transmission lines. I didn't even need to move the lines at all and this was done on ramps.

But - it was very challenging to get the top bolt started into the hole since the space is too small for my hand. Luckily, I was able to do it with tape holding the bolt on an extension (and several tries).

Note - using the brake light adjustment method, I was never able to get the brake lights go out with the selector in reverse by moving the PNP housing. Despite this, it fixed the 3rd gear (winter mode) issue and the transmission works properly in all gears. Disassembling the old switch showed good contacts - all in about the same (clean) state. Perhaps this is why cleaning them isn't recommended.

Tom