I have a 2005 roadster and had the same issue. I solved the Brake Light Switch mystery for mine. my dash wiring only has one wire 2wire bundle going into the one plug. The new Switch has two plug slots. I plugged mine in the A (marked at the bottom of new plug opening side. And then noticed that the plug would only go in one side because of the two raised areas on the plug that match up with two channels in switch. I think this is all correct. But I have not checked other issues yet.
you might try this but check other post for conformation.