@MontyChambers did you do the Nanocom check (not while driving) on the two inputs ? No point in replacing the switch unless you're sure it's broke !!
The RAVE procedure had a missing bit between 7 & 8. It should be:
7. Extend switch plunger fully.
7a. Hold brake pedal down.
8. Fit switch & then release brake pedal.
That way the pedal sets the plunger correctly when you release the pedal.
View attachment 341450