Heavensward, there's no contest between those options for me. Haurchefant and Ysayle broke my heart, I miss them so much. ; ;
I did however get excited when Estinien showed up in some SB cutscenes though, and I also enjoyed having Zenos as the main antagonist. But, for me, nothing beats those 2 certain cutscenes in Heavensward...you know the ones! ; ;
