If DC is going to keep Gal Gadot, keep her as WW. Otherwise, why pay the salary for Gadot and a new salary for a new WW actor? If they just have to do the switch, pick a character other then Harley Quinn and fit the costume. Margot Robbie should play HQ for as long as she wants. Gal was OK in the first movie and an origin story is probably the hardest to play well. Everyone is figuring out the new character interpretation. The second, WW1984, was, IMO, a waste of a movie slot. Not her fault. At that point she is just an employee that has to do what the director and producer say. Or walk away. I thought she did a decent job in the rest.