I feel like the saber should still be tossed. Nothing has changed for him to be conflicted about the decision he made years ago. He doesn’t know about Han yet, he doesn’t know Leia is in danger, and believes Kylo is beyond redemption.

Changing the music cues to make it seem less like a joke, and removing the scene from Force Awakens might better achieve what you’re looking to accomplish.

Luke needs motivation for his conflict, more than a strange kid bringing him something he lost 30+ years ago after he got rid of the one he built for himself. If you want to have him more conflicted, I’d recommend re-inserting the “Luke Takes a Moment” deleted scene.