It’s very very hard to cut around Han in Jedi. Believe me, I’ve tried. He does a lot of the action and has a lot of the exposition.
I remember toying around with having Han getting saved AFTER the Battle of Endor, but it messed with the flow too much.