So it seems after the fire at Abigail's compound [somewhere around the green circle], Nick followed blue arrows, getting ambushed by the La manas while he was in the horde, somewhere near the blue circle, and finally ending up at the Colonia Safe Zone with Luciana and Alejandro in the blue star [N for Nick]

Strand and Madison went north and south for a bit looking for Nick, then headed NW along the maroon arrows back to the Abigail [west end of red line], where it was gone. They then went just a bit more north, ending up in the hotel in Rosarito [maroon star].

Stars will be current locations of each group in future.

Note: even though the producers and actors have stated that Madison's group is now located at the 'Rosarito hotel', its also possible they will turn out to actually be farther north, on the west side of Tijuana. We'll see.