As an aside: if you bring it in to be tuned up and it still shifts rough - get it to a good (different) mechanic. I had my bike "tuned up" a couple of times by guys who clearly didn't know what they were doing. I was ready to trash the bike. Once I got my bike to a solid mechanic WOW - night and day. I've put just under 1000miles on it since the real tune up and it's still shifting smoothly.

And I have crap components! The lowest you can get!!