Got my hands on a copy of what's labelled "the shooting script". And of course it's different to the final film. I'm gonna go thru it and see if there's anything of interest. Nothing major yet, mostly dialogue changes / omissions.
Re: data, I'd rather not see him die but his sacrifice [and journey] means little if he's simply an expendable asset.