There's almost a page of sensor checks that you can do yourself with just a multimeter, that way you can check the basic functionality of the EFi system without paying £30 and hour for diagnostics. It could well be something simple.
BTW, as well as checking the idle bypass, have you checked the base idle speed? that's around 500 RPM IIRC, the idle bypass lifts the idle speed to 600 or so.