Glad it's working. I actually added a default store country function that I didn't get a chance to commit before leaving work. It'll be in core tomorrow morning.

No one else should have this problem from now on.