The work continues. Taking longer than I expected, but I found more that I didn’t like with the original wiring. Crimps were pretty bad quality as well. I ended up redoing all of the mains wiring. Ran out of wire to get to the outlets, and I still have the low voltage to do as well, but it’s getting there.
I’ll probably also put an acrylic shield over the outlets, but I have to get everything back together, first. 
