Ended up having a new rudder built at CCI in Ottawa Ontario (~2400) and a new Martec prop (~950 delivered). The Rudder looks great - very easy to deal with this company.