To test if it is the switch remove the leads and then connect a wire across the leads. With the ignition on the brake lights should be on.
I would expect your switch to be as the 2004 car.
You can if you are quick remove and replace the switch without needing to bleed the brakes.
