Interesting idea! Actually I remember that the Death Star battle seems quite added-on after the rescue and escape (except maybe the planting of a tracking device...), so it could just be cut off and lead into Empire somehow. That seems nice really, so you don't get this artificial climax in the first act.