The key to the Shikamaru fight is pretty blatantly obvious. Unless Kishimoto wants to throw another curveball, the answer lies in Tayuya's Flute. He's figured out that she's controlling the summons with it; now he has to figure out how. Once he does that, if he catches her with Kagemane, it's over.