I doubt it will be hair vs. mask. They won't stick a stipulation this early in their feud. A hair vs. mask should finish their feud much like Kurt and Edge had. That capped off their feud.
I can see them adding it if they plan on finishing off CM's SES, but they shouldn't add it since the group is one of the best natural heat getting angles in a long time. I also don't see a need for Rey to go over Punk here, but chances are they're gonna make sure the Rey fans go home happy.