I say Endgame is both more entertaining and the better movie than Logan. People say Logan was 'tighter' or more 'tonally consistent', but I found the whole X24 aspect of the story felt like a very different (more comic booky) movie than the rest and the various kids at the end were just utterly generic and poorly done, so for my money, Logan was just a smaller, more intimate movie, not a better written one. They're both very good overall - don't get me wrong - but Endgame is the more consistent story.
Having said that, Wolverine has the better death, hands down. Iron Man's final line before snapping - while well written - is ridiculously drawn out to the point that it kind of undermines the moment for me. And while Tony has a LOT of stuff leading up to it that's truly great, eh, so does Logan. Him and Charles and Laura together have so many moments that easily equal everything that Tony gets with Pepper/Morgan/Cap, etc, and while Tony's funeral was touching, Laura's mourning for Logan was devastating (even if the pointless kids hovering in the background were annoying).