Bad luck with the switch, but with our cars that would have been to easy!
Beware of the 2nd hand motors on ebay as I bought one recently (trying to do the job on the cheap) and when I tested it before fitting, the bloody thing didn't work at all. Fortunately, I got my money back and the seller told me to throw it.
Not sure where from yet, but I will be looking at an after-market one in January as I don't think they are difficult to replace - Just a few nuts and bolts.