TooMuch4You

So about a year ago my ignorant self tried to use a S4 headlight switch harness on my S5 car, and needless to say, some **** got fried. Since then, my headlights will neither pop up or turn on with the light switch, but they will pop up with the switch above the light switch. So since then, I've been using the above switch to pop my lights up, and I've been jamming a nickel behind the turn signal stalk to keep my high beams on all the time. I've gotten rather tired of doing this for a year, and would like to take it somewhere to get it fixed (i hate electrical work more than anything in the world). So i was wondering if anyone had any shop recommendations, or places that you've had good experiences with in the Portland area who could deal with this. It doesn't have to be rotary specific, and it doesn't have to be a performance shop (I'm guessing that a general repair shop will have lower labor rates).

plus i got a fix-it ticket last night