I can only figure out how to do one or the other, not both at once.

Never mind, I figured it out! Just name your zip something different and upload it. It's really that easy...