First off, revving it in neutral is no test, forget doing that, check spark on all cylinders when it's playing up, all cylinders, not just one the 3 cylinder Yamaha has a unique ignition system! if you have dirty fuel and you clean the carbs, and run the boat, the carbs can get "dirty" very quick, clean them properly again and run off a remote tank complete with fresh fuel and hose.