I'd try checking the phase sensor gap for the idling problem, mine idled around 1500 when it was out, worth a try? As for the OP switch, afaik thats not part of the engine loom and only goes to the clocks anyway, so i'd just try and connect one of them and if it doesnt work, swap them round