Japan just needs to be smarter about who it brings in and how they integrate people into Japanese society. Japanese society is in some ways extremely tolerant even more so than most western countries but it's tolerance rather than acceptance. The main issues I see is that Japan is going to be pretty crap at integrating the older children of immigrants there since Japanese is not an easy language to teach and the Japanese school system isn't really equipped to deal with immigrant children.