Since I’m planning on removing the idea that the Falcon is easily trackable by anyone at anywhere in the galaxy, I think there should be a better reason for Han to find the Falcon as quickly as he does. The only way I can think to do that is if Rey intentionally travels to a major spaceport after escaping Jakku. So here’s the idea:

The Falcon jumps to Hyperspace after leaving Jakku, then immediately cut to Kylo being updated, in order to cover the trip through hyperspace. Kylo asks ‘What girl?’, and in answer to this we cut back to the Falcon leaving hyperspace and arriving near a new planet, followed by Rey and Finn’s introductions. It wouldn’t be too difficult to cobble together some imagery of this planet in the distance with lights moving here and there indicating that it is home to a busy spaceport. It could use my shot of the Falcon leaving hyperspace from Restructured as a base. After this, the previously bisected scene of the Falcon repairs would need to be joined back together, and Finn’s line ‘we need to get out of this system’ could be reinstated. Presumably this is Ponemah Terminal.

With those changes, I think it would make more sense why Han is able to find the ship so quickly, as well as the arrival of two separate gangs soon after.