I think this is going to fix all of your issues. I almost wish I could do my install again. The wiring would be much neater. But, I'm not too dissatisfied to do it over. Did they let you keep the old Sniper? Parts source!