Dug into the wiring more today. Removed most of the wrap and convolute and determined how the routing is going to go for the main leg and the engine leg. I have also decided to flip my PCM over so the wire bundles exit downwards rather than upwards. This is requiring a new mounting setup so need to work through that. All in all, I feel pretty good about what it's going to take to button this up. Just a quick photo showing the gist of what I'm doing.