Between yesterday and today I got the tail light and left headlight harnesses rebuilt, also rebuilt the tail light housings themselves with all new gaskets (there were none in the housings when I pulled them out...).
The drivers side as I was hooking everything up and running conduit.

With the housing re-installed. The ground plug for the socket is to the right of the B/U socket.

The passenger side before re-installing the housing. The ground is plugged in and you can see the back-up light wire ready to plug into the wire from the housing.

This is the new tail light wiring from under the car. I still have brake and turn signals but no park or tail lights. I think this is much better.