Well, the bike is shifting fine now, but I'm going to take it in to the bike shop next weekend. I just want to upgrade the shifters and deraillers, I'll tell them throw in some new cables too.
Then, the drivetrain will be upgraded, and I shouldn't have any more problems. *touch wood*