Should I make the swap to G3?

If you need a list of connectors I might have it as well. I just completely rebuilt my engine harness from scratch when I did my MS3X computer upgrade. I found the actual connector models for pretty much every stock component on my 2006 5.7 at least. That way I could buy it at a housing and terminal level, not just pigtails that you have to splice. Usually quite a bit cheaper that way too as most connectors are really only a buck or 2 and most terminals are maybe 50 cents each plus a 10 cent wire seal. Beats paying $5 a connection like a lot of the places that sell connector kits charge.

I might be interested in that list as well...