As racerone says, the idle speed is too high.
It should be 650-700 RPM in gear in water.
Check the compression, it is always good to know the numbers.
As you says it stalls when put in gear with lower idle speed.
That can be caused by a lean setting of the air/fuel mixture screws.
Try to set the...