I'm not sure when this change happened, but I just talked to Gale during the celebration after saving the grove. He didn't say anything about showing me anything magical. In fact, all the romance leads with his dialogue were super obvious and there was an opportunity to talk to him as a friend!
I found this to be a great improvement. So much better.
He mentioned not having many friends at all, and we entered a friendship through dialogue. Nothing weird or sexual, just a polite friendly conversation.
I'm almost positive I went through another playthrough in patch six where the conversation didn't go this way. I'm not sure when the change happened or maybe something triggered the difference in my playthrough, but regardless, I'm really happy it played out this way.