I’m nearing the end of the main quest, and if I had to do it over again, I would probably deal with Orin second to last before Gortash. (I killed her before I did any of the companion quests.) So that I could stock up on the most cool gear before our duel.