Why does it being referenced bother you? it's not like you're watching it. You still have to look at dick when you watch straight porn, but you only have a problem when somebody says something gay. Just say you're homophobic dawg.
Man his arc is literally about him coming to terms with his gay feelings for you do you really think that would make any sense at all if he was a woman. If you want a 'surprise woman' trope then just keep playing the game, there literally is one.
