My current pan and stick are from an old OMC setup where the dipstick tube attaches to the bottom of the pan at the drain plug hole. I've always seemed to have trouble getting an accurate reading.

I'm going to pull the engine this winter to stroke it and I want to buy a new/higher capacity pan and a dipstick and tube that go thru the block like a traditional setup.

Can anybody recommend/explain to me a decent pan and stick combo? Would like a 6 qt pan. Do I need a different style pump and pickup for a larger pan? Just want to make sure that I'm getting good readings when I check the level. Also has a windage tray currently installed. Would I need to remove it or is ok for use with any pan I choose? Current pan has no baffle in it, just using the tray attached under the crank.

This is a SBC with no oil cooler, just power steering cooler, just an FYI.