Top work!  You will not regret re-pinning the connectors - while it is a pain in the arse the increase in reliability and performance makes it all worth it.

I am a stickler for "original" and would have used silver hammertone, but in saying that the black powdercoat looks great

cheers
Ian