For me, that ending was less about the surprise, and more about the pacing. Like I said above, it just repeated the same information over. And over. And over. There was no build up, no intensity from a plot stand-point. If they really wanted it have an emotional impact, they should have done it from Deblanc and Fiore's perspective; their nervousness about meeting him, their odds that he won't comply. Have them showing up to the deserted town, the empty saloon and reveal the Saint of Killers as the gatekeeper. It would have been shorter, stronger, and since we had already established the angels were on this journey earlier in the episode, it wouldn't have felt like plot whip-lash.