Drilled out and replaced all 34 leaky rivets with a little dab of 5200 on each. Also drilled out the pinhole and filled in with stainless steel bolt, washer and nyloc nut, also with some 5200. Found about a dozen other misc screws through the hull used for mounting transducers and things, and filled in with stainless hardware.
As for the broken ribs, I repaired with angle aluminum embedded in epoxy, and attached with stainless hardware with some 5200 on the heads of each screw.
At each break site, I drilled out a rivet near the break and drilled another hole outside of the break and another inside of the break.
A little messy looking to be sure, but I'm not worried about looks of things that will be underneath the deck.
It was a real leap of faith to drill more holes in the bottom of this boat in order to make the desired repairs!
6 ribs, 2 breaks each (one port and one starboard), one aluminum angle on each side of the break = 24 removed rivets +48 new holes.