I think it would have been a better idea to have Rey find the saber whilst scavenging junk, rather than the Maz scene which was purely a device to bring a saber into the narrative, Maz giving Rey the magical gift (transference).
Agree that would be better, but still too convenient. Even better would be that Rey finds a lightsaber while scavenging. Not Luke’s.