Yup, you have to use the 3L mains to work with the revised pickup tube and windage tray. . .

This info was confusing as hell to me, but Demon has been kind of enough to clairfy it for me a gazillion times,

To repeat:
New Escape Oil Pan +
New Pickup +
New tray +
New Main Studs +
New Dipstick and Sleeve.

That's all that needs to be done.

Now you can just do the new oil pan if you don't want to mess with the mains, but if you're getting your engine done, migh as well, right. . . .the part numbers are ALL listed above or in other posts. . .