Definately sounds like the switch to me, I installed an HID kit with seperate ballasts to solve my issue. So far they work, switch hasn't burnt out yet but its only been like 2 weeks so we shall see. Do yourself a favor though, they are only like 14 buck each for the switch be sure to buy 2 of them and keep one as a spare lol. Anyway, HID is cool, xenon bulbs are super bright!
A guy told me one time "don't let yourself get attached to anything you are not willing to walk out on in 30 seconds flat if you feel the heat from around the corner"