don't go by wire colors, use the pin positions on the plugs. AEM has some good literature that includes a table of what pin controls what, so the best way would be to look at the 86-88 and 89+ tables, and match them up.
since your building an adapter harness, it's also a great time to wire in...