I did the upgrade last night. 25 nighthawk and it works perfect. Used the same parts as you have listed. After replacing the the parts I did have some related codes so I cleared them first, Then I only enabled the Auto headlamp to activate. You may want to check and make the sun senor connector...