If it were me, I think I'd replace the brake light switch. It's cheap and easy and a known failure point that can affect several other systems. Get it from the dealer, though, I've heard bad stories about aftermarket ones.