With the pan off, put the dipstick into the tube and mark it about 1/2" below the low point of the windage tray (someone else weigh in if that is too close or too far below the tray). Then, when you install the pan, measure how much
oil it takes to fill it to that mark. Fire it up and let it fill the system, shut off and check...top off as needed and keep track of the total amount of
oil. That should prevent overfilling and keep the pickup submerged for normal running.