What I meant was the car end of your adaptor loom will need 4 and 7 crossing over some how. Either cut, cross, solder, heatshrink or push the crimps out cross over and push them back in... Go for the one you feel more comfortable with!
 
ah right solder on the other wire for me, dont fancy braking the car end lol. O and Im pretty dam good at soldering (the only electrical thing I really can do).