If the leaks and deleted scenes are true about Adam Driver filming a scene with Daisy on Tattooine, this would suggest originally, Kylo and Rey were supposed to “retire” on Luke’s farm in the final scene.
This may be possible to still do, with Driver digitally inserted. Maybe use heavy shadowing in the Binary Sunset, possibly lighten up his dark outfit, etc.
Rey could look to the side when asked for her name by the farmer, and maybe have Ben smile and nod, giving the ok to call herself a Skywalker now.