While the ending of the film is still satisfying in an in-universe sort of way, it also doesn't entirely feel natural to me as a writer. It's prescribed, the sort of ending we expect. And it even has them getting "their old ship" back after a fashion.
It only works because at that point in the film, the audience wants it all to tie up neatly. And as a franchise, we certainly can't make permanent changes now...