What are you doing to manually choke the motor?
That model does not have a mechanically activated choke plate. It uses a Yamaha PrimeStart system. Automatic fuel enrichment.
If the motor is not over heating then the water pump flow is more than sufficient, no matter what amount comes out the...