I finally got around to swapping in my D15Z1. And I found out that the oil plug is stripped. I would rather just replace the pan than try to rethread it. But D15Z1s are not exactly popular at the Pick-And-Pull. However, D16Z6s are. Is the pan the same between the two?