I like the diode idea, my odd-ball bulb is burned out as well.
I'll have to give that a try.

I had the same cold-solder issue.
My trouble spots were on the top side....

I went ahead and re-capped the lower power amp -
seems to sound a little better too.