Brian,

I am late to this dance, and Allen & Stumpy are doing a fine job.

I just want to remind you about the fresh paint in your engine compartment. Fresh paint is pretty, but the enemy of good ground contacts. Make sure the to-do list includes undoing the body ground (the one from the negative post of the battery) where it attaches to the core support. Scrape/sand all that pretty paint away to reveal BARE METAL, then reconnect the (also cleaned) wire eye to that spot of bare metal. Find where the headlight wire harness grounds are (probably similar wire eyes) and do the same clean-pretty-paint-to-bare-metal fix.