I agree with JJB, this was Leia’s last shot & i think it would be a disservice to change it,but i get why you would want to change it.
I think looking at the ST, movie 1 is about han, movie 2 is about luke & movie 3 was supposed to be Leia’s & i think they accomplished it better than alot of people could when you look at the limited amount of footage they had.