Original ending confirmed now, end of this episode is the end of the second to last chapter of the manga.
Skipped two full arcs to reach (mostly) the same conclusion but without any of the darker stuff that happened in them. Maybe they had to for censorship reasons?
Spoiler: show
Whatever..