oil pan

No way you should need baffles. The pickup should be no further away then 1/4", and no closer than 1/8. Also make sure you never unscrew it to position it. It's pipe thread, and if you do, you run the risk of the threads not sealing well.