To update, after my in-store visit yesterday afternoon the shop owner promised to have my bike ready for me by the next day (today). They called this afternoon to apologize that the very last thing they need to do, replace the bearings in the headset, is going to take longer than expected since they don't have the right kind of bearings in the shop, and will need to make a special trip to the dealerships.

He explained how bad he felt for the long wait and offered to open the shop on the Fourth just so I could come in and pick up my bike from him. I told him I've already waited a month, and one more day is all the same, especially on his holiday, so that I'd just come by this Thursday. I'll keep you guys updated.