Yes use the windage tray. A stock one or an aftermarket. Not sure if Ford is still selling the CJ tray, but Summit has
a good selection.
Use a Melling M57HV or the M57B oil pump. Both of these pump will read about 60 to 65 psi at 2500 rpm when hot.
If you want less on the gauge then use a M57 and it will read about 40 psi on the gauge.
I always use a M57HV and a heavy duty drive shaft.
You can use a stock pan, but not all stock pans are worth using. You want some slosh control and most FE oil pans have none.
In a stock pan you want 6 quarts and one in the filter for a total of 7 in the system.