Is this what you had in mind?

I've made a few changes to the setup, but nothing drastic.
All changes made are mentioned in my notes (in red in the file).

This actually would be no more difficult using the zip code....