I have a brand new Moroso 20625 oil pan for sale.
(http://www.summitracing.com/dom/parts/mor-20625/overview/make/ford)
It comes with the correct oil pickup 24508
(http://www.summitracing.com/dom/parts/mor-24508/overview/)
and a moroso universal dipstick
(http://www.summitracing.com/dom/parts/mor-25970/overview/)