This is part of the reason I advocate for a restructuring to include most of the deleted first act Finn stuff - it makes it easier to keep the Luke scene, and helps balance the film with so little Canto Bight and, by extension, so little Finn.
I’m an advocate of this idea as well! It’s actually been on my mind for quite some time. With the axing of Canto Bight, we need as much Finn as possible!