I have a 1982 Catalina 30 with the original Universal 11hp. My wife has no confidence in this engine any longer as we have done quite a bit of work on it and it is okay at best. The real problem is that we are in the San Francisco Bay and are always fighting wind and curent. Do you know which engine (larger hp) will interchange with my Universal?