An idea if you want to still keep most of part four:
Cut straight from “where’s leia” to the scene where they’re planning to infiltrate the fortress. This cuts out the abrupt and kinda clunky scene of Roken (was that his name?) changing his mind about helping Kenobi.