After changing a light that was out behind my speedo, all of the lights in that cluster are now not getting a proper connection, inconsistently on or off. Since I've messed with all the bulbs and the main connector I'm not sure where the issue is or how to fix. All of the connections look clean and fine. Other than die-electric grease, which I haven't applied yet, I can't think of what else to try. Ideas?

Also, I've had issues for months (years?) with a short in the left stalk for dimming the dash lights. I've read that there is a spring in there that goes bad. Now, with the above issue, it seems to have gotten worse to the point that I need to fix it. What do I need to replace to fix that short (I have the stalk and housing removed from the steering column)?