I have a truck pan that I extended to hold an extra 3 quarts. As for the oil return I've never been able to find info much on this so I ground the block to match the holes in the heads, ground the drain hole in the heads a bit so there was a V towards the the valley they had cast and cleaned every bit of flashing out of the block and polished the valley a bit. Hopefully it's enough.