Looking into the crystal ball I see you finding that your B18 sump doesn't mate up with your new oil pump. Sump baffle tray just needs a bit nibbled out from it to make it fit. Currently, I can't find a picture showing the mod but someone may have one. I think Volvo issued a data sheet which showed what to do.
If not the case, good luck with your search.