No luck finding pin part numbers. Retrieved some wire ends and a connector (albeit not the right color) from an early A4 at the pick-n-pull and assembled this intermediate connector.
Inserted two additional female pins on the harness side for the black (87F) and red (30) lugs. With this the AAN harness can be kept intact. One pin empty for the tach, but that's on a different connector.