>My only suggestion of the word heir is that it is already gender-neutral, applying to anything basically (a person, a group, a company, that is able to receive something -- so why not use it also to apply to people in those situations where "he" or "she" would work equally well?

But heir is a male noun, the female form would be heiress? So you end up in the same mess as before.