One word of advice - I would run a thin piece of wire through each hole when re-assembling to 'stitch' the two sides together as the through hole plating was poor to start with and may have been damaged over time and with all of your EXCELLENT efforts.
I strip off a piece of multistranded hookup wire and use one strand of that. Stops any nonsense & eliminates problems when things heat up and become intermittant.