i would go with a canton oil pan. you can get a stock 5 qt. or get a 7 qt. i don't know about the clearance with the 7 qt. but more oil is always better.
windage trays are pretty much all the same. but if your in there you might want to toss on a girdle too. dss has decent ones from what i hear.