Something inbetween would be best maybe - the 15hp 2 stroke Yam or Tohatsu is perhaps the ideal match, not sure of the max rating (if it takes the 25 then it will be very lively)!
Its a great engine so I would try it first as I think you will be v happy. If you feel you need more speed you can always upgrade to more HP after trying you tohatsu