The thing about the southern Stormtrooper scene is that, with a bit of searching, better dialogue could be inserted easily after removing Tom Hardy’s jokey lines. Since all you need is dialogue that intimidates Finn, you could theoretically have the trooper say anything. It doesn’t have to be recognition, it could be something like “Officer, is there something the matter?” and a single line from Jon Boyega saying “…No.”
With the right music cue and timing it’d work great.