[CarlC]

I did something very similar in my 1st-gen that has a fewer cavity bulkhead than a 2nd-gen.

Ended up swapping everything over to the 2nd-gen bulkhead (inside and both outside) in order to have enough cavities for the serial data port, reverse light switch, MIL, etc.

Since the engine side is a two piece arrangement, one plug is just for lighting, the other mostly dedicated to getting the underhood mounted ECM data into the cabin. This makes the whole thing much easier to service, but the swap is not for the feint of heart electrically.

The system is also purposefully not running high-power accessories through the cabin fuse block. Modern high-output radiator cooling fans require more than 30A. Keeping the high-power items localized allows for "killing" them if needed without affecting other systems.