If you wanted to stay heel for one more season you could work a feud with Manuel Angle. He's looking for redemption after a string of losses, and you (arrogant bastard that you are) would be out to show him up for the loser that he truly is. If you're still thinking about unmasking you could build to a mask vs. career match at the PPV. Angle would have to go over, but it would give you a good excuse to reinvent yourself as a face, since Manuel would have shown you what true honorable competition is all about and so on.
Then when you inevitably turn heel again at some point you can just put the mask back on and voila! Instant heel once again. Plus you get extra heat for going back on a match stipulation.
What do you think?