Just one observation: from what I understand, that design is something imposed by the Chinese government, so I believe you have to follow it.
I am not a Cisco Meraki employee. My suggestions are based on documentation of Meraki best practices and day-to-day experience.
Please, if this post was useful, leave your kudos and mark it as solved.