I recommend holding off on doing too many of Quinn's conversations until after the "incident." For me, it made it feel like the relationship still had room to grow and evolve afterwards and allowed me to end the story on a positive note.
That makes sense actually, because it's clear that the very last conversation in the romance arc (training the future) is supposed to happen AFTER the incident.
Malavai starts the conversation with :
I decided to do that with my juggernaut, I'm holding back on the 3 last conversations in the romance, and will trigger those only after the "incident"