Joseph,
I think we are all the same when we have to take our bike in for service. I think they should be very clear with you regards to the time to fix it and if they tell you to pick it up, it should be ready. Beyond that, a week for them to do anything is not the least surprisng to me. I have found that speaking to the mechanic who is working on the bike is usually the best route to take. The shop where I bought mine has several mechanics, and usually if you just ask the guy who answers the phone, he may have no idea how work is or isn't progressing on your bike. Another thing that may help is go in in person, may not be convenient but you can usually judge a response better face to face, additionally when you call you probably have some one on the other end of the phone is busy taking care of the "in person" customer, relegating you to second place in their attention ratings.
Three possible solutions, repair the bike yourself, find another shop, or have a second "back-up" bike for those times you are suffering separation anxiety. I would guess the majority of folks here have been through that exact same separation pain. I know I have and it was miserable. I think stopping in and asking with a pathetic and desperate look and tone about me, may have helped speed things up, but on the other hand, may have just made me feel better since I couldn't be our riding!!