Oh!!! Yes! I experienced something similar! I had always had Raih'a as a regular person in the world, and that's where his NPC version stems from, but in SHB, for the first time, I felt like, "Oh, -I- really am THE Warrior of Light!!!" It was great storytelling!

Yes! SHB and Endwalker will always be top tier expacs for me.