YAY!!!!
Sounds like you got a great bike. And sounds like you have a bike shop that cares, too.
Can't wait for pictures!