I would reconsider your choices for oil, particularly in a PWC. I had a 2014 Yamaha FXHO until last summer. I put 110 hours total. In salt and fresh water.
Regarding your PWC, you are probably under a warranty from Yamaha. My guess is that its at least 2 years, if not up to 5. In that case, I...