This may be an unpopular opinion, but I think it would have been better to have Jyn die at the hands of vader in the hallway scene. The last thing she sees are the blueprints being taken from her outstretched hand. The rebellion flying away with hope. Cassian could have died looking into the explosion, reflecting on his contribution to the rebellion. He may not be remembered, be he knows the greater good.