I had a similar problem. Same thing would happen but also when in neutral and the ac came on it started surging as well. I spoke to my brother who is a Ford Master Tech and he said he had just come back from Melbourne and they covered this issue which they said was very common. I took my car in and he done what is called a PCM Teartag calibration. Since then (2 months ago) I haven't had an issue.