Poor Carrie, first off.
I remember reading a rumor that Leia’s gonna be in a coma or something in episode 8. If that’s true, that would be an easy way to deal with Carrie’s death. They should do something where Rey uses the force to go inside her head and rescue her. She finds her in her subconscious and tells her good news (Kylo repented or something), and Leia say’s she’s at peace and is willing to pass.