Just for kicks, I took a look at some other ways delivery and pickup are handled. Obviously, this is an apples-to-oranges comparison, but I thought it might spark some additional ideas.

One of my local grocery store chains, Roche Bros., offers pickup (at some, not all locations) as well as zip-based delivery. 

They have multiple pathways -

You can specify ship to/pick up up frontOr you can start building a cart without specifying ship to/pick up...."start shopping" brings me to product categories.

A few more clicks and I've located coffee creamer and added it to my cart.

 

And I can easily go back and forth from delivery to pick up

Here, I've navigated to some product choices, and Sears is presenting pickup/ship/deliver options with each result, in abbreviated form, and detailed.