Right then got back from picking up the bike and I am please with the service I received and all my issues are being sorted. I have to say Tamworth Yamaha are spot on.
They inspected the corrosion and were sure it was caused by salt from the roads, as you know I am a bit of a cleaning freak so I am sure its poor finish, they did advise just like Meach did that when I wash the bike use good cleaner which I do and to wd40 the bits that are vulnerable. I will start to do (wd40) this as I dont want a repeat performance. They are swapping all the parts under warranty no problems and will give me a call when the parts arrive to fit.
All in my first 600 mile service cost �37.43, I have gone through the check list and they have done the normal things. The top end rattle has gone as well but I dont know what they did to cure it but I am not to fussed as it has gone and now runs smooth again after chains adjustment and lube.
I asked about the first 6000 mile or 1 year service costs and they said that all in with parts and labour it will be �137. I am not sure what I get for that but I have to say I am not to unhappy with that price especially as I have to get it done officially to ensure my warranty is valid. I guess I wont do more than 3000 miles in the year so I have to say another great reason to have an XT.