Ok, I thought we had this one nailed! I disconnected the EGR valve and plugged the hose line, started it and let it warm up. It went through all the gears ok, so I took it for spin. Seemed to run ok for a while. Got it up to 50mph on the outer roads. When I came to a stop, it would Idle as normal for a moment (30-45sec) then the it would Idle down, shutter and stall. It started up just fine. Sounds like it also has a miss.
Also, it seem that it takes a long time to rev down after sharp accel. Not the same power it had also.