Did you solve your problem? Your issue (with the exception of not returning to idle) sounds like a crank position sensor. The M&S lights were probably related to low battery voltage.