Like indicated above, oil pump should probably come out anyway, need to clean it including the oil pump screen. If you do not want the pump to drop into the pan when removing the pan, then you can use the npt tool (or other methods) to hold it up into the block, do not over tighten the tool, and remember to swap in the slotted plug when finished.
Do not know if previously mentioned (sorry, being lazy, do not want to reread 42 posts), when you get the valve chamber cleaned out, use pipe cleaners to clean out the 3 oil passages /holes located on the back bottom of the valve chamber.
This previous thread shows where the plug is, however the screw/nut is incorrect. It is below the valve chamber cover and below the oil return tube. Read the entire string.
https://www.fordbarn.com/forum/showt...retaining+plug.
Another tip to reduce the mess of using the drop method to get the dipper tray out is to put it in a or multiple garbage bags. If it is stubborn like mine was the 1st time, put a 2x4 across the oil pan opening, use a c clamp to pry it out, one side of clamp on the 2 x4 and the other side through the dipper tray oil pump opening. Another method is to use a baseball bat to pry it out. If you do a search these are the primary methods to dipper tray removal