I have both types of Wave here and yesterday I put the 17 casting on the new EZ lock pins and it works fine. The pins are a little longer on the EZ lock so you may need a spacer on the bottom to share the load on the top and bottom. Then the arms and cross bar will need some work. Just get them on the boat and get them tracking good and your set. You can use a tiller now so cut off each side of the cross bar.