Take the car back and have the Ford Dealer Fix it. You paid for it to be fixed and it should be. Also it shouldn't cost you anymore. Incorrect diagnosis is their problem.
As far as the dieing at idle. If you don't have a CEL then reset then computer. It also seems like the car might need a Throttle Body and upper end cleaning. Maybe the EGR Vavle replaced.