Buy the shop, not the bike. Whichever shop you feel better in, I would go with them. The shop ideally would be convenient, they should treat you with respect, and give you confidence in their ability to stand behind what they sell you. Those quality differences are way more important than the differences in the bikes.
If all else is equal, then buy the one that you like the looks of better. Better to buy the one that speaks to your soul; you will want to ride it more.