OK, more progress this week.
When I installed my bilge pump and got the batteries hooked up and tested it, some water was leaking back down the hose. I had to remove everything anyway, so I decided to replace the thru-hull with a new stainless one:
and a new fitting inboard:
Got all the wiring sorted and tied down, as well as the batteries:
more to come...