Warren Farrell wrote "The Liberated Man" back in the '70s; in it he suggests the words "te" "tes" and "tir" to replace masculine pronouns in those situations where the referrant is non-gender-specific.

Oh my. We do seem to make thing horribly complicated for ourselves, don't we?