Jonno, did you ever sort the problem? i recently bought a new tracer and have the same issues with very clunky gear changes, I came from a z1000SX which was quite smooth, I have heard the Yam gear change is fairly notchy. When i first purchased it i rode it 250 miles back home in really hot weather and the gear change was really quite heavy in the end.