i dont understand why you removed the whole fender. You could have just removed the inner liner instead and just replaced the couple plastic rivets? Seems much easier. Only thinking here.
Not sure about the factory auxillary switch stuff, but I installed a set of Rigids on mine about 2 weeks ago and hooked them up to a wireless switch setup.