If you have difficulty with rebuilding those little lamp holders, here's an alternative.

You can simply solder the Radio Shack lamps directly to the PC board.

At first this might seem a bit sloppy. But, if you think about it, it's not that big of a deal. All the rest of the "stuff" on the board is soldered and, down the road, if you want to restore the original lamp holders, the solder can be easily wicked from the board.

I have a relative who works for a company which builds cockpit switches for commercial and military aircraft. He said it is very common, in that industry, to have switch lamps soldered directly to the board without any provision for replacement, short of a board-level repair.

So, if you break one of those lamp holders while "rebuilding" it, don't sweat it. Just solder the lamp directly to the copper lands.