I am having the same issue as mentioned above.
I followed the directions given and added an address under Commerce -> Pick-up to each location.
Even after this, when I send a test email, the address is still listed as the default "Street Address, City, State..."
Additionally, there is nowhere in the Commerce -> Pickup location options to add or change hours, and changing the hours under my Business Information does not change the hours in the Pickup email.