Sounds like you got a good bike shop that realized it was probably their fault or maybe it came that way to them. They had brought another bike of the same model from another store just in case? WOW, that is truly going the extra mile. I agree, buy anything you need at that shop. I try to support my shop, sometimes online shopping rewards me in huge savings, though I have learned my lbs is cheaper for cables! I will probably buy another water bottle cage next time I am in there. Had them put a blue cage on my Sirrus when I bought it, and I want another
Go ride...

should be worry free now!