An edit could be made in the flashback sequences tongive kylo the skywalker lightsaber. It would explain a few things including why ren says that lightsaber belonged to me, how maz kanata has it and why luke throws it over his shoulder.
He does have the Anakin Skywalker lightsaber.