Smart of them to do that. Should sell a lot. At least they're finally acknowledging that not everybody likes Cena. Edit: Also Cena is actually gonna be on Fruity Pebbles boxes now. Gotta love the Rock.
I would like to see Taker fight somebody else at WM besides HHH. While Taker/Henry might not be a new, and would probably not be a great technical match, it would have a lot of momentum behind it if Henry continues his world title reign all the way to WM.
Looking at it this way, there are possibly at least 4 main event level matches going on at WM.
Rock/Cena
Punk/whoever for WWE championship
Taker/whoever
World championship
They could combine one of those by having Taker face the world champ. Then again, given that Taker is not gonna lose, it would be kinda stupid to put the belt on him since he's a once-a-year thing.