I had the same problem on my car 3 yrs ago, and replaced the in-line switch. Sorry can't remember exactly where it fitted though I seem to recall it may have been down near oil filter under left wing. Part also bought from BHM but digging out invoice there is no p/n.
Good luck curing the problem.
Cheers
