Wouldn’t it be kind of odd to have Luke not involved with rescuing Han? I like most of your ideas, but that one in particular stood out as a sore thumb. I mean, in a way, I could imagine Leia telling Luke he has a bigger responsibility to finish his training. And I do like the idea of Leia being more involved in the operation.
It’s certainly not perfect, no. Between shortening the sequence and giving Leia a more active role, I couldn’t see where to fit Luke in.