I use a windage tray as it serves a different purpose form the baffles , the widage tray keeps the oil off the crank , the baffles keep the oil from sloshing away from the pick up tube .
both capacity & baffles are important so I would say the deeper pan with baffles would be the best choice .