Did you ever fix the problem , I think I am in the same position with the light now, I have replace the brake switch once about a year ago.

Let me know how it ended.

Thanks