Please Help identifying underhood components

As far as I know there's no major wiring difference due to engine options.
IF Dan Stern has a source of older halogen sealed beam Nighthawks, that would be decent.
As reported on the Candlepower forum, the more recent Chinese made version lost focus (pun intended).
See here for links and photo comparisons: Crackedback's Harness

When I last looked the lowest price 7" round H4 with a decent pattern and focus was the Hella 'Vision plus' when used with a good bulb. I haven't needed to buy new bulbs in a while so see what Stern (or Virgil on Candlepower forums) has to recommend for current bulbs.
Last year Stern had some Bosch lamp housing for rectangular lamps (and maybe also 7" round) that he had found were comparable to the Cibies he had previously tested.
While these are more expensive than sealed beams (or Hella's Visionplus line) they are still much cheaper than comparible LED headlamps. And some of this comes down to personal preference. That being things like the 'artifacts' as the lighting guys refer to the pattern within the beam. The other being the aesthetics - some kids want the new and cool LED look, and others want something more classic and stylish. ;)