I don’t like either of your choices for wedges. Hit both and both have low kick points and in wedges, that is a no no. Smash factor just hoists the ball higher, not farther...unless you have a tail wind. If you like the Nippon in your irons, the cut weight in stiff is about 97 grams and you will want a cut/finish weight of 107-110 grams in your wedges and mid/high kick point max out your distance. The best wedge shaft for you is going to be a stiff flex 115 gram KBS C Taper #7 iron shaft. IMHO...ha,ha