I think cutting the Walker and emphasising the Bounty Hunter changing Din’s mind about staying would be a good way to keep that.
You could cut the planet entirely and treat Cara like someone he’s familiar with from prior to the film and recruiting in those finale scenes also.