thats probably the best bet, should only cost $50-$100, it'll probably ending up being the smallest thing that needs to be fixed,but at least you know it'll be fixed properly.

ive got the same problem, but mine is a racecar so its not as vital, but mine also blows the blinkers.
it has the h4 light upgrade so im thinking it is overloaded.
but you could spend days tearing your hair out and 10 mins with the auto sparky and i would probably be fixed. bear in mind i think the going rate of laybor is 80 bucks, but dont quote me.