I agree that you should wait on upgrading. $600 really isn't going to be enough to get you where you want to go. Ride the hell out of that bike and keep saving.