2001 yamaha 115 4-stroke FI idle problem

I have a Yamaha 115 4-stroke that recently started having a idle issue. When I am at the dock in neutral or slowly putting it on the trailer it will drop rpms and die around 500-600 rpms usually happens after it warms up. When I restart it idles high around 1300 rpm then slowly drops rpm and dies. On the water at speed it runs perfect. Pulled plugs and they were carbon fouled, put in new set and no change. Motor has 500hrs and has good compression, oil pressure. Recent new stator and rectifier and batteries, and thermostat. The local Yamaha dealer say they cant use the YDS on it because this is a AUS motor.
Any input will be appreciated

We will figure it out once we meet up and we then can post what we find

I have the same problem with a 2003 Yamaha F115 with only 320 hours...... Any ideas?????