[tasdrouille]

Tumble and swirl should mix everything together real good.

Christ, the EGR is accounted for from MAF readings.

EGR does in fact slow the combustion rate, so maximum brake torque timing advances with EGR rates. I don't know the details of the sensors in your car, but may I suggest when EGR is activated you also activate a relay adding a very high resistance in line with the IAT sensor. If the ECU thinks it's -40 in there, that might get you ~2 degrees of advance.