The job took about an hour, working slowly and carefully. I used a continuity tester to ensure the brake switch operated as soon as the pedal was slighly depressed. The wiring and plug for it is already there. Also, the steering column switch just plugs into place after first cutting the shroud, again, helpfully marked with the bit to be removed.
Now, all I have to do is get the RVV setting changed in the ECU, and it's going to be done at one of our local dealers this Monday. I'll report back if its a success. Also, if anyone is interested I can supply a list of the part numbers needed.