I don't think Gus originally planned on killing Nacho, as he could've just had his goons kill him when they went after Lalo.
But after Gus talked to Eladio, who knew Nacho was in on it, all that shyt went out the window.
Gus gave his location to Eladio when they broke the safe open, and he expected Nacho to die.
Unfortunately for Gus, he didn't.
If you expect Gus to be perfect, which he mostly was in "BB", it's not a very good plan. But this Gus is more prone to mistakes.
As far as the Nacho/Jesse comparisons....that's spot on. But Nacho is Jesse 2.0.
If Jesse was in any of these situations, since season 1 of this show, he would've died a long ass time ago.
Fred.