Jade Dynasty - S2/S3 Xiaofan Question, spoilers okay

Hi all - I'm in the process of catching up on Jade Dynasty and I'm halfway through S2, so I know I still have a ways to go. Perhaps this is answered in what I haven't seen yet, but I wanted to ask about Zhang Xiaofan/Gui Li and spoilers are okay.

I know that the story has been primarily centered on Xiaofan's journey of understanding the nuances and overlap of "good" and "evil" and that at the moment he feels betrayed by his Qiangyun Sect that he decided that it's better for him to be with the "demonic"/Ghost Valley sect. I assume that the story will continue to be about his journey philosophical understanding but,

1. When will Xiaofan cement his own understanding and identity about "good" and "evil" or is that essentially going to be the whole story? On one hand, it's getting a little repepetitive seeing these two "sides" continue to push and pull with him.

2. I know that his relationship with Bi Yao keeps him tethered to the Ghost Valley sect and that it'll probably be a big thing for him because of the personal responsibility and affection that he holds for her. But when or does he ever rise above from that burden and is he able to move on? It's clear that the show is emphasizing this "will they/won't they" relationship with XueQi and it seems like it may be something that Xiaofan will continue to self-sabotage because he can't get over/move on from Bi Yao.