I don't think they'll deandrogynize Griffith for two reasons:
1. Griffith is a role Ezra Miller is born to play
2. The subtext of the fake feminist raping the warrior chick he's been friends with for ages is too great a temptation to not explore*
*During the horror of the Eclipse, the final horror that is the exact moment that Casca is rendered irreversibly insane is the moment Griffith rapes her at the climax of his transformation into a demon lord. A moment that is even more mind shattering when you factor in that Casca has a hero worship of Griffith that started when they first met, as Griffith first met Casca when she was about to be raped and he saved her from being sexually assaulted; an act that earned him her undying loyalty, even after she met Guts and fell in love with him. To the point that it caused her to make Guts and the Band of Hawks rescue Griffith from jail.