Hi Powernutty,
Not sure if you have fixed this? If not, and apologies for the obviousness of this, but why not call your local Yamaha dealer and have a brief chat to the service guys with your well detailed description below. I find my local dealer is pretty helpful on this stuff.