I restored my stock windage tray. Should you need a stock replacement I found a few used trays on www.firebirdcentral.com, saw that Ames Performance carries one and that Butler Performance has an option. I recall that there are short and long versions so you should confirm the dimensions of tray that you need. As for the oil pan, I've researched the pan dimensions issue and discovered that many of the aftermarket pans have clearance issues and people sometimes just dent in the corner where the inner steer arm impacts the pan to create clearance. I have also seen aftermarket pans which have the drain plug on the driver side where it is obstructed by the starter. I'll probably end up getting a zinc plated pan from Butler (the one I have now) and just dent in the corner to create the clearance between pan and the inner steering arm when making hard right turns. Three year drivetrain rebuild project and I am an oil pan away from completing the project. This clearance issue almost caused me to destroy my rebuilt engine.