Remember in the manga when cp9 showed the buster call? One of the marine places had a Shaolin Monestary kind of place.
Well when i saw it, i imediately thought," Maybe the Mugiwara will go there."
So i thought up of arc. There could be kung fu fighters and the person luffy has to beat is "sifu" The master could know wushu, wing tsun, and many more.
There would be other weaker monks that zoro could fight. One that could wield the dao sword or the other sword the chinese would use.
Another fighter would be like a person that has a specialty towards kicking and sanji could fight him/her.
The rest.. I'm not sure. This is all i thought up of.