Thanks, rsavage, I know that this may not work but I'll give it a go again. I did it in Ubuntu 12.10 with a negative result and I reverted to the original setup with minimal hassle. If this doesn't work and the revert is ok then I'll (hopefully) just be back to where I am now.

It is connecting relatively quickly, usually within 10 minutes of booting up, at least most times.

Thanks and here goes...