That does sound like a crap deal. Did you get back in touch with Yamaha and tell them what the dealer had decided? I would have thought it was not in Yamaha's interest to get bad PR by treating you this way. Failing that, you could take a case with the Small Claims Court: Goods should be fit for purpose.

Regards,
Tomo7