Here are the wire colors you'll encounter based on the diagrams so far:
SOLID COLOR / STRIPE
YELLOW
BLACK/WHITE
PINK
BLACK
DARK BLUE
GRAY
BROWN/WHITE
WHITE/BLACK
LIGHT BLUE/WHITE
LIGHT GREEN/BLACK
LIGHT GREEN/WHITE
LIGHT BLUE/BLACK
ORANGE/BLACK
LIGHT GREEN
TAN
PURPLE
TAN/WHITE
PURPLE/WHITE
RED
BROWN
GRAY/BLACK
DARK GREEN/WHITE
DARK GREEN
WHITE
YELLOW/BLACK
RED/BLACK
DARK BLUE/WHITE
LIGHT BLUE
ORANGE
Quite frankly, if you were careful in what you did and was meticulous in labeling everything, you could minimize those colors down to just a handfull
Red - 12v
Pink - Ignition 12v
Black - Grounds
Then just pick out a few other colors for anything that carries a signal, such as the MAF signal. I can almost guarantee you that you will have to resort to such a tactic if you want to do this work. Striped color TXL wire has proven very difficult to find.
However there are a ton of pink wires in the harness, tons of black and red. And Ive toyed with just pulling the grounds out of the harness and connecting them at the point of the sensor. For instance, the MAF has a ground wire. I dont believe it has to run through the harness, so why not connect it right there at the sensor location or in close proximity.
I think there are a lot of little ways to cut down on the number of wires in the harness. For instance you could run a common ground point to a couple different places in the engine bay and do the same for any +12v supply voltage.
Anyway, that is where Im at. Once I have the connectors I'll begin cutting mine in order to de-tangle the harness and find out what would be the best way to route everything.
