Should I re-power with T25 of F40?

[johnboatcat]

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 hp help me in high head winds or would it just over rev? What prop should I use on an F40 if the T25 uses the special dual thrust 10 5/8 - 8? (There is a dual thrust that fits the F40 in 12 1/4 - 9.) Thanks!