After some delays due to weather, work and other things I finally got back to this. I did some of the cleanup of the wiring for the outlet circuit (put the wire coming out of the subpanel in conduit, rerouted it and eliminated an unnecessary outlet).
I then wired in a GFCI outlet as the first...