Your reasons make total sense. I definitely saw some people who said they felt tricked when Haru turned out to be a boy as opposed to a girl so I get you trying to change that to make people happier. And yes with the thousands of different ways people have recommended you change their story I can 100% understand why it would be impossible to come up with 1 solution that would please everyone.
As long as what you choose in the end makes you happy and content I think the game will be amazing. :)
This story has so much charm and genuine human effort put into it that I couldn’t help but love it. Again good luck with finishing the remake. :3