Just in case anyone else is like me and is rewiring the gauge cluster due to a ruined circuit board, I found replacement lighting sockets with pigtails (replace the twist lock sockets with terminals on the bottom) here:
http://www.hipoparts.com/bulb-socket...tic-or-rubber/
Took me a while to find these so I'm hoping this will help someone in the future.