Man, I hope so. But the possibility of some dumbass in creative thinking "Hey, lets put Jack Swagger and his new anti-hispanic gimmick against our new latino star!" is just too great to ignore, not to mention the ever-present possibility of Randy Orton being pushed.
Plus there's the whole "Jericho wins and Ziggler cashes in" thing too. The odds are definitely in Henry's favor.