That is looking to be the plan. I'll try the double oversize self-tapper and if that fails to hgold at a reasonably tight torque, drop the pan. I have the original one off this engine that I can use for at least short term. The machine shop brazed the one rust hole and drain plug is good.