Do I have bronchitis or pneumonia?

I am a 23 year-old female, who is also a smoker (I know, I know). I got a cold about a week and a half ago, and around the 3rd day, the cold moved to my lungs, and I am now worried that I may have either bronchitis or pneumonia, because it hasn't gotten any better after a week. I don't have a fever, and have still been able to go to work and perform all of my normal daily activities, but I hear crackling noises in my lungs sometimes when I breathe in, and always when I breathe out. I don't really feel short of breath, but have the constant nagging sensation of needing to cough. And when I do cough, nothing comes up, even though I can hear the congestion in the lungs. I have been taking mucinex, an inhaler that was prescribed the last time I had bronchitis, and have been drinking plenty of fluids and nothing is helping. I have a doctor's appointment on Friday, but am wondering if I should wait that long, or if this is something that should be dealt with sooner. Any suggestions on what this could be or what I should do about it? Thanks!