I currently have a 30' sailing catamaran displacement hull, powered by a 2004 T25. The motor works well on the boat except in very high head winds. It is time to re-power and I am wondering if I should go up to an F40 (same weight, different gear ratio) and re-prop the F40. Would the extra 15...