I tack-welded a baffle into my stock pan after reading two cases on here where guys trashed their bearings from racing with slicks and no baffles in stock pans... I would say stick with the stock pump and pan and just add a baffle and windage tray, or go with an aftermarket pan