I love your idea of including the ‘Kylo searches the falcon’ scene. Do you have a sample of the work you’ve done on it and how you’re integrating it into your edit? What’s the sequencing of events like?
If you’re including the scene where he’s talking to the trooper in Starkiller Base and suddenly senses Han, then you should definitely remove his “Han Solo” line in the falcon since he already says it in the preceding scene.