You could just get a Master Air Screw prop and probably not have a fit problem. Some pilots prefer APC and some MAS. Not a significant difference, especially on a trainer.

APC makes different models/shapes of props too. You may have props from 2 different series, hard to tell from the pictures.