Issue with debriefing Tristan so can't complete Casting off the Veil companion quest

[Stuckesy]

I'm having issues where I can't debrief with Tristan to complete the Casting off the Veil companion quest. When I set it as the active quest, the little head symbol displays over Tristan but all I can do is select the generic repeatable dialogue options. Is anyone else experiencing this bug and has anyone found a workaround for it?

[Stuckesy]

So just adding something else I found. Virgil is still on the 2nd floor of the basement in the Arbiter Training Facility despite having despite getting past the point where you can kill or spare him. The door to the stairs are now sealed so I can't interact with him. Because of this, it seems like the quest is stuck in a state where we have to wait to hear from Virgil (as current dialogue options with Tristan seems to suggest that) even though the quest says to debrief with Tristan and there is a marker above his head when I'm on the Incognito.