That looks similar to what I have but I use one that has the white plug in the end where the speedo cable hole is. I use an electronic 160mph VDO speedo.
got it all hooked up, a little more cleaning to do but only with zip ties, nothing fancy. I turned the lights on, everything works to my satisfaction. Only issue is the electronic fuel pressure gauge reads full so probably messed up on the wires on that somehow, don't know exactly what yet, will check it out.
come on, you know you intentionally rewired it to make your car safer. we are just waiting for the tech article to be written up on what wires need to be moved where to do this.