Just to close this one out, the problem turned out to be the switch on the steering column. I've changed this and everything is working fine. For future reference the replacement column switch is Lucas P/N SQB119 39897.
Thanks for everyones help and suggestions.