As for Diana, making her butch would be an insult to her as a character. Diana exemplifies that a woman can be both feminine and still have the strength of character to be a hero, this has been stated in canon for decades. Making her butch implies that a woman must take on masculine traits in order to be an equal to her male peers, something Diana herself would find insulting. Your opinion on her outfit fails to account for what kind of culture she comes from, in terms of modesty her current outfit covers more than what the ancient Greeks wore in to battle (en.wikipedia.org/wiki/Ancient_…. In order to make her as you wish her to be you would have to butcher her origin, all to satisfy a modern feminist ideal.
And here comes the part you are really going to hate, you said: "that the only way a woman can be happy is by being with a man who is as powerful or even more powerful than she is" was wrong... Well... it's not. How many women want a guy who is physically weaker then them? Shorter than them? Dumber than them? The answer is not many, women are attracted to certain things in a man simply due to the way their biology works, the same is true for men. Do you think Lois would be attracted to Clark if she could physically overpower him at any moment. Finally, you totally ignored my point about how a massive difference in strength would destroy any relationship, so this time I will use Diana to explain. Say Diana is sleeping in a bed with Steve Trevor, she has a nightmare during which she kicks... now, depending on her sleeping position there are any number of pieces that Steve's body has been torn into, but I think it would be safe to assume he is dead or close to it. For someone with such great strength a relationship with anyone not on their level would just be negligent to the life of others, man or woman.