Yeah, I think I would just remove them from the ending. Especially since it repeats the ending montage of ROTJ.
EDIT: I also think it’d be beneficial if Ben Solo lived in this edit, because what becomes of the First Order after his death might leave the film with too many questions.