Drilled the spar cap and doubler holes to 3/16, refitted with AN3-6A bolts instead of using solid rivets. I'm a nuts and bolts sort of a guy, and not about to learn or spend money on solid rivet tools. Bolts $65, rivet tools ??. All new parts fitted to centre spar, this spar is now probably twice as strong as original.
