You'll be happy to know that freedom of expression is slowly being crushed in Japan, just like everywhere else, so you won't have to feel creeped out much longer.
The UN's obscure subdepartments can demand, but Japan doesn't have to comply. And considering the size of the market for hentai, I don't think it's going to go away any time soon.