I do not have experience with either of those bikes. I am riding a Steel cyclocross for my Commuting needs.
I would pick the bike shop option, as long as you can get a rear rack installed in the deal. Add a rear trunk bag and your set. Upgrade with front and rear lights
You will gain a new relationship with the bike shop and they will be happy to see you when you come back for upgrades.
Good Luck.