Here’s the ending of ROTS. I’m pretty happy with how this is turning out.
I’m coming into this very late, so this might have already been discussed. But have you thought about or experimented with changing their birth order so that Leia is born first? That way it’s Leia that spends the most time with her mother, is even caressed by her before her death. I think it would really help to smooth over the inconsistencies with ROTJ.