That all said - to me (no spoilers) the final scene should have been the one around 5 minutes before the end.