Check the 2005 Service Manual to see if there is a difference (I doubt that there is, but...).
Anyone out there who has change their brake lamp switch?
Please provide feedback on the number of 3 pin connectors you found plugged into the switch.
Cheers,