Olympic diversity push highlights Japan's struggles with cha