Heartache by the Number bugged?

[DynV]

Hold on, now after talking to Cassidy she asked too see the sites of her dead caravans. I'm not sure if your help will be necessary.

I have Heartache by the Number in my quest list and I'd like to get rid of it. I got Cassidy to let go of her caravan, I then settled Birds of a Feather. I don't know if it's because I visited the sites of her dead caravans before ever having her as a companion but I wasn't asked by her to do so nor did I see a dialogue option for it now. It seem now the only way to end this is to

Spoiler

kill McLafferty

and as I'm doing the Crimson Caravan quests, it will have to wait before they're done; but I'd rather have the Peaceful solution, is there a way to do so?

Thank you kindly

 

[DynV]

I did manage to complete the mission peacefully, well for the faction that was still intact as in the OP. I don't know what happened for Cassidy to move on past just wanting to apply the solution in the OP spoiler.

BTW can one of you make mods? I'd like a simple one, make any of the beds in the Silver Rush give the Well Rested effect now that it's uninhabited?