Found a temporary work around for me that allowed me to finally move on to the next section.
I had Shadowheart kill herself in camp (avoided her losing approval) then I had my strong guy pick her up. Fast travel to where I needed to be and revive her with a scroll.