Installed the swap oil pan and pickup last night.
Shot of the inside of the swap pan, each corner of the sump has a trap door:
This is the pan the engine came with:
Ready for install:
Pickup tube installed:
Swap pan installed (dry except for RTV on the seams of the block where the covers meet the corners):