2004, X type diesel. The car has 132,000 miles on it, regularly maintained. Recently under acceleration it cuts out, (randomly, Some days 10 times other days once or twice). Turn the key off and on and it will run again for a while no problems. Sometimes eml light will come on, sometimes glow light will flash

So far I have tried.....

Re-con injectors
Replaced fuel pump
Replaced cam shaft sensor
Cleaned egr valve
Replaced airflow senosr

My mechanic has given up and I have given up at this stage..
Anyone have any other ideas that I might have missed. I have searched the forums and everything is pointing at cam shaft position sensor, but we have replaced this with the grey ford type.......

Lost!!!!