the adaptation, and the discrimination against Dixingren

Ooh, yes, that's an excellent point! They kept the unfairness of the system, but translated it into mundane terms. Excellent!

But he really doesn't need additional bullshit like that to make it even worse - he's messed up enough without it. :P

I'm not sure I agree there? All his issues are so inextricably bound up in what kind of being he is, and what that means in the world he inhabits.