Front Brake Light Switch

Has anyone else had bother with these (the little electrical contact switch under the front brake lever) or is it just me? I replaced one earlier this year, now that one is stuffed. The little spring loaded plastic contact gets stuck and doesn't pop out as it should when you pull the lever itself. I took it off and filed the sides of the pop out stub a bit and gave it a dose of WD40, but it just seems like its a cheap (and nasty) part. My bike is a 900 Thruxton, but I'm guessing Triumph fitted these throughout the range of bikes. Its true, they only cost a couple of quid off ebay, but has anyone found a more reliable alternative?