I think the solution is to insist that these gender stereotypes and gender dysphoria are two completely different things. Meanwhile, we still have to work hard to dismantle the gender stereotypes and expectations in wider society (which have nothing to do with trans people or gender dysphoria).