I'm currently in the throes of my 12A install in a Corolla.

I'm finishing up the ignition wiring and wanted to get confirmation or correction from the veteran rotary community on my wiring layout.

I've been referencing Tulsa Turbo's diagram:


I'm employing the 3 GM HEI modules and wanted to make sure I understand correctly:
I DO gut both the leading and trailing J-109 ignitors and wire the internal terminals directly to their respective points for the magnetic pickups since I'm going with the HEI modules as I mentioned earlier?

I plan to wire the J-109s as follows:


I'm taking this method so that the top left blade is still + and the right remains - as per the service manual diagrams that I've been referencing.