Oil pump drive shaft

Yes the machinist did install it. Although I think the problem maybe with the shaft. Not wanting to tear my engine back down I took the shaft out of another 360 I have laying around and it fit like it should. Not wanting to scavenge parts from that 360 I took the shaft out of a 318 I have and it fit like it should too. Since I am selling the 318 I would prefer to scavenge that shaft from that engine. My only question is the 2 360 shafts have square corners on the teeth and the 318 shaft has chamfered corners. Can I get away with using the 318 shaft? Or what I may try doing is to take back this one new from Napa that doesn't fit and and see about getting one from my dealer.