I think I’ve got it! Yeah, BB-8’s still carrying a map, but it’s simply a map Poe’s been using to track and catalogue Force-users. If he’s working undercover in First Order territory to find Force-users and get them to the Resistance, then BB-8 could store his data for that mission. This way I could retain mentions of a “map” in TFA, but cut mentions of Luke himself being connected to said map.

This, then, shapes a new opening crawl: something to the effect of "The New Republic seeks to spirit Force-users out of First Order territory. Covert operatve Dameron Poe finds himself on Jakku at the same time as Imperial agents in pursuit of a young woman said by locals to possess ‘magical powers.’ "

Not necessarily worded that way, but you get the drift.