I think this kind of surgery should be treated as cosmetic surgery, so everyone who wants it can get it... by paying it yourself.

It' s really simple for me, if it' s really a treatment for dysphoria, then it should be subjected to medical gatekeeping, and that gatekeeping should be much more objective than "this guy hates his dick so much that he wants to get rid of it, let' s make him wear skirts and make-up for a year to prove that he' s serious about it". However, there is no objective anything that can be used to prove that this not only is needed, but also that it' s the best treatment and that it actually works. Levels of satisfaction among the trans community isn' t really a good way to show how great this thing is, because people who are severely mentally ill and/or obsessed will have a much harder time to be honest on the outcome.

So in the end, it would be like any other unnecessary modification of your body: you want bigger boobs? Pay for it. You want a liposuction? Pay for it. You want to cut your healthy breasts off? Pay for it. You want to get rid of your penis, for whatever reason? Pay for it.

I don' t think linking transition surgery with stereotypes is a good idea, but I don' t think transition surgery is a good idea to begin with.

Also

I think the current system is one that forces dysphoric males to choose between violating women's rights or having control over their own bodies

Nobody is forcing them to violate women' s rights. They decide to do it. Nobody is forcing them to change their sex markers on their IDs, nobody is forcing them to use women' s sex-segregated spaces, nobody is forcing them to join women' s sport leagues, nobody is forcing them to steal women' s position in politics, organizations and schools. They want to do it, they feel entitled to do it, and at this point I think they also enjoy doing it.