One thing you might want to consider is keeping your current T for your gender work and have another T, possibly even a non-queer one, for everything else.