Seems I'm completely stuck here.

Either I fight Shadowheart, losing her as a companion or I let her kill Nightsong, which isn't an appealing choice either. My character has CHA 18, but I have a 30 to roll to convince Shadowheart otherwise. Not even a perfect 20 could resolve this, since I only have 9 bonus points.