I’m onboard with the ethical retreat. The informant seems nervous, but he and Cassian appear to be friends with the more casual way they speak to each other. He’s an honorable person and I think he should be portrayed that way all the way through.

I like the way that you handle the jail scene, but instead of asking if he’s the pilot, I’d keep the scene the same as the original and just jump to having Cassian ask “Galen Erso. You know that name?” That way, Bodhi still sounds slightly out of it as he says “I brought the message. I’m the pilot, I’m the pilot”, but you skip the mumbling.