I would check the oil sensor wire. Mine became loose after some extended motoring last summer, with exact same symptoms.