Quick note, if you're in that area swapping o-rings, theres a temperature sensor on the large pipe into the base of the EGR. Its easily visible by moving the washer reservoir bottle. Theres an o-ring on there. You could just replace that o-ring, but a new sensor is very cheap.

Guess how I know this, and guess how loud the whistle becomes when that sensor isn't in its hole...