Just to close this out, I have everything back together and working correctly. Simply a matter of getting all the wiring properly routed and cleaning up all the connectors.

I'll tell you what though, it sure was easier 30 years ago to do all this under the dash diagnosis.

 

Thanks

Thank you for following up. It's good to know the resolution. 

By the way, you better be planning on attending ZCON.