Will look round the shops for a multimeter tomorrow. Any idea what i should set it to to test the switch? (Never used a multimeter before)

Ill also try to resolider the wiring once i dig out my solidering iron. (We just moved recently so alot of stuff is in boxes.)

I will also email about the switch as suggested.

Thanks heaps to everyone for your help. It is greatly appreciated