mrmadcow, most uk houses use 32a ring mains for the power sockets.
Growww, electrocuting yourself isn`t a good idea. My guess is you may have tucked the earth wire (with the soldered terminal attached) into the top of bayonet light socket and shorted it to the live or neutral pins.
You don`t need the earth wire in the bayonet fitting, only the blue and brown. You have a few options,
A) cut the green/yellow wire back so its out of the way and wire the brown to one pin in the light fitting and the blue to the other pin
B) drop into wilko/B&Q and buy a length of 2-core cable (3amp) it`ll only have the brown and blue wires.
C) Buy the homebase light fitting.. which sounds like the safest bet to be honest
I see its an edison screw (ES) lamp fitting but the light fitting that zapped you is bayonet cap (BC22). Best check your cfl has the same kind of base or it won`t fit.