So, to follow-up on this oil baffle question - I gave up on the Germans, and installed this all steel baffle system:
When I first pulled out the stock baffles, I was pretty impressed with the design, and wondered briefly if the EBS design was really an improvement, but then I test fitted the EBS baffle into the sump without the pan and saw that the way it seals to the side walls really increases the "still" center volume near the pump, the seals very effectively block sneakage from left to right sides, and the total window area into the center section is larger - all good things:
