Tim, You should give Yamaha one more shot - to the head. They still haven't gotten it right, AFAIC. Your loyal dealer should do some shouting on your behalf, let you hold on to your present 7/900 until a good new one comes in and then pay for the return shipping - with a smile.
_________________________
Riding on the Avenue of Time
cassp50@gmail.com