Ditch the EGR since you are tuning it anyway.
Are you going to keep the DBW?