Oh yeah, baffle yes.
But as far as the pickup goes, it might be better to have it higher up off the bottom of the pan so any of the heavy crud parts have less of a chance to get sucked in. More of a chance for them to stay at the bottom of the pan where they will drain out at the next oil change.
