Nice job TC
Just found these pics from my archives which might be of help?
They show where to solder.
90% of non functioning lamps is like you say down to the rivet joints or corroded PCB tracks which just need bridging with thin wire.
Better still run wires the whole length of tracks for good measure.
