For something that's too iconic, the Ultimate comics didn't have a problem to ditch the mask entirely. Even later seasons of X-Men Evolution got rid of it. And even if they'd introduce the mask, it would probably only be for a short moment, like as you said, when he goes covert. But the moment he's part of the X-Men again, there's absolutely no reason anymore, for him to wear a mask. Unless everyone does.