Helping a friend with gender identity

So my best friend recently told me that he's been questioning his gender identity since as early as Jr. High, he is 23 now. I am totally fine with it and supportive. He needs someone to be there for him and I'm that person. But it's a little complicated since we've been on again off again dating and hooking up for the past 2 years. We definitely have feelings for each other,  it's just some other circumstances keeping us apart. Plus I think it's important he come to terms with these thoughts and sort them out. Is there any thing specific I should do? What can I do to support him? I'm trying my best to not be a good friend and not bring my romantic feelings into the mix. Any help is appreciated.