Yes that is correct.

 

Quick update from me - I thought I would try some contact cleaner spray on the switch to see if it would help, however having seen where it is I realised that I wouldn't manage to get anything into the switch without taking it out (I can see, or at least feel, why this switch is such a pain to change) but having had a good grope around where the switch is I don't get the warning anything like as much so maybe it is just a poor connection or only a slightly faulty switch. I can live with it as it is for the moment.

It did show a fault code for the switch when I had the codes read recently, so at least I know where the fault is.

 

Before you go through the pain of trying to change the switch out, try wiggling the brake pedal or letting it "pop" back into the released position a few times. I had the same problem intermitently for a day or so until I did the above. No problems since. (shhh...)