I wouldn’t add the whispers when Rey shoots the Stormtroopers, or remove the reference to the Death Star (I kind of like that bit of lampshading, even if it is a bit too cute by half.)
Personally I also don’t think the thumbs up moment lands as well without BB8 divulging the base location but I could go either way on that.
Otherwise I agree with everything on your list.