Keep the front game as-is.
On the one hand, if you are paired up with a Z-List celeb who can't play worth shiat either in the giving or receiving department, then the contestant can use the 3rd (round) category to either give or receive to make the best of it. If only given the chance to play only 2 categories, and the celeb gives (and sucks) first, you're pretty much dead meat. With the 3rd category, the contestant knows what setup was stronger (give to, or receive from the celeb) and they can try to make up for a bad category or bad celeb that either gave or received poorly.
On the other hand, if your talent coordinators do find both celebs and civilians who can play the game effectively, there is a good chance that they won't need all 30-seconds anyway for every category.
Overall, even with the amount of time devoted to commercials, if you take out the promotional prize considerations at the end by making the game an all-cash show, have the credits flashing through on the lower 1/3rd of the screen during the final act/wrap-up of the day's winnings, and limiting the chit-chat to a fraction of what was done on the Clark version between rounds, I really think you can still fit a pair of six 30-second category rounds and two WC games into 22 minutes and still not look rushed.