That Xerxes rework was awesome.
Edit: There's a minor inconsistency due to the rework later on Idris when you're leaving and find Nyx and Arin discussing how you met Nyx. And maybe some stuff in the codex, but that's really not a big deal to be honest.