So here it is, T-Harness with the appropriate taps. The main cost is that the harness is fully populated. Although not all pins are used, they differ from car to car depending on extras, etc. So to play it safe they are all populated.
The first cars are being installed with these this weekend.