Darn Fred, that is one lousy dealer. You should post his name so no one has to go in and find out the hard way. He'd fit right in up here selling the big four Jap bikes. All our local dealers as far as I can tell are crooks with dealer licences.
Well, it sounds like a warranty repair isn't a major concern of yours! It isn't really a major concern of mine either. I figure I have to work on it when the warranty expires anyway, so why not learn now. Mine has a cylinder head leak, fork seal leak, burned out headlight and the front brakes aren't quite right. The dealer offered to do it all, but I settled for him buying the parts and me doing the greasy work. Thats ok with me. While I'm at it the PAV and crankcase breather systems are going away, and I'm fitting a bigger sprocket, new exhaust and tweaking the jetting to richen the old girl up a tad. I think there are some other minor things as well, but I forget. Tinkering is fun, what can I say.
Whatever you decide to do, have fun with your OCD!