Have it so that Luke destroyed the Death Star cannon, but not the whole station, which forced a retreat. In that respect, his mission was successful as it stopped Yavin from getting vaporised, but unsuccessful in that it survived around Endor...
Perhaps you could also jumble it up a bit and have Leia rescued by Han before the final battle...? the stories are going to be hard to jumble about though.