Speaking of stories, I really need to know

I'm romancing him my first playthrough and did a lot of googling to make sure I'm not missing anything, but I'm beginning to get worried. I already saw the first long rest bug where he accuses you of accepting Rachael's deal, went alll the wag back, long rested again (losing a lot of progress on another quest). Made sure I denied the deal, yada yada, it still happened


Major spoilers ahead, unfortunately I don't know how to properly spoil messages on this website yet!

.
.
.
.
.
.

I know he's meant to propose if you do things right and dissuade him from the crown, but I keep hearing that karlach needs to die for it to trigger. Unfortunately, I didn't grab karlach in act 1. Is this still a bug i need to worry about? Would all my progress be for nothing?