Don't even consider Donnelly's. Go to Campbell first or Lincoln Heights.
Pascal, I'm surprised they work on the car under warranty considering all of the modification to the wiring - Awesome! Hope they find and fix the problem before the weekend.
Good luck.