Question on what we should include
I tend to agree with your suggestion of using both at this stage.
Thanks for noticing my question, and offering an opinion. I was just thinking about this question again and noticed that WP includes both the country sub-categories and the main country pages in its lower level country categories (which we don't have yet). Both does seem right. I'll work on getting that done.