Rich, did you sort out the brake lights staying on?
just a fwiw, sometimes if you pull up on the brake pedal it will readjust the switch so they go out. Also, there is a clearance spec in the FSM for the rod from the booster to the M/Cylinder....that doesn't have anything to do with the brake lights but it is an important spec to be observed.
sorry for butting in on your thread.
Tom