I just purchased a 1985 Catalina 30. It has the 21 hp diesel, and a 2-blade prop. On the sea trial, I noted that there was considerable prop walk when using reverse or when trying to slow down and stop going forward. This boat will be used primarily for cruising, but also for some club racing now and then. As a sailor, I'm very much interested in safety and dependability. What do you recommend, and more importantly, why? Thanks!