I think your right dave ( 1.45 am and raiding my haynes manual for you by the way )

30 PBL
31 earth
1 coil
87 fuel pump

15's a brown wire which im sure is the ingnition on as said but cant guarentee it, so long as your wiring is still in the original nic ill get a photo of mines tomorrow after work and post it up for you

do any of the other spades wiggle at all? if so crack it open and give it a clean up and a solder and itll be righ as rain.