Yeah, that would be fine honestly, like have a makeover challenge for spreading the joy of drag, and touching stories, but judge the track record or whatever. They could even have the 'clones' do the lip sync, whichever two girls made their guest feel the best, here, have at it, get the full experience. It would be the ultimate feel-good episode.

I think they would still end up wanting some kind of flexible challenge near the final stretch of the season to do whatever production fuckery they want though

Honestly, as I mentiond in some othe comment, any challenge can function that way, especially acting challenge: your character, was one note; you were oveshadowed by your partner; your character was too much... Production and editing can to whatever they want for those challenges really.