I think the best way to make Luke do something cooler in the movie is having the begin of his return happen in a moment when he sends the rebel cruiser through the Supremacy.
You’d use the bits of him contacting Leia to show him Force concentrating as the ship turns around and eventually flies through Snokes ship.