This might sound really daft, but I had a very similar problem and it turned out out be a leak on the air induction pipe after the mass air flow sensor. Replaced the pipe, and after a couple of miles it settled down and went back to normal......