Yamaha announced this week an extra 3 years of warranty thru Dec. 6th.
So why wait, go ahead and get 'er done.