Thanks Ben! This is the best workaround I've found so far, but as you say it leaves a bit to be desired on the usability front.
Shopify - when will the options for billing address be properly uncoupled from shipping??? It's perfectly reasonable to expect that customers from other countries will buy gifts etc from a site for local shipping.