+1 on GR9s
I think the most overlooked upgrade is tires. Most stock bikes come with garbage tires. Get a nice front and as nice of a rear as you can afford to replace on a somewhat regular basis. No matter how nice the rest of your bike is if you've got cheap tires it's going to ride like a k-mart special.