What about tiered reorganization by region:
e.g. 1st level Asia, under asia, the countries
2nd level China
under the country, the cities (or states for US, canada, australia).
3rd level Shanghai
under city: airport, dining, entertainment, and maybe others, all in dedicated forums to each subtopic.