I'd get some 3 foot sections of wire and straight line it to rule out loose connections. Doesn't sound like a short or you'd have blown fuses. Sorta sounds like the socket.

2005 Model . Two Fast Eddy stickers , a bell and a clock . She's Lola . She tinkles and keeps time . http://s649.photobucket.com/albums/uu211/britbike05/