Great that you are trying to be gender inclusive. I’d need to check with someone more knowledgeable but I suspect non-cis-male is better here to include trans-men.