While I think only horrible people hack up perfectly good factory harnesses instead of buying a $7 plug harness, if it's already hacked up, I'm not sure I'd go through the trouble of returning it to factory.
Antihero
Putting AMS garbage, and $500 ebay wheels on a Z is like dressing a Victorias Secret model in a Walmart dress and Payless shoes. You're embarrassing yourself.