Agree with everything you have written, only thing to add is people will be protected based on the sex they are perceived as, e.g. if a trans woman is perceived to be a cis woman and then discriminated against because of this, they are still protected. It's little consolation though.