Have Chewie wear a Stormtrooper outfit as well.
So after Luke comes into Leia's cell and Leia says, "Aren't you a little short for a Stormtrooper?" Chewie follows him and she says, "Aren't you a little tall for a Stormtrooper?" and then she bumps into Han and says "But you, you are just right".
This would foreshadow their romance in a way that the sort of audience George pitches to these days could understand.
Lucas is a man of the world, he knows about women, he knows what they want, not too short, not too tall but just right.