Personally, I would put the championship over the streak. Because then you can say "so what if you always win there, cause *I* have the title"
Obviously, but if Taker wins, he's not facing him at WrestleMania anyway. Taker would just replace Angle in the Rey/Orton three-way. This way, atleast beating the Undertaker he gets the streak broken.
I'm not talking about it that way. I'm saying Taker could have won, and Henry could have fought him next week, hypothetically. Also, if Henry would have fought a champion Taker next week and beat him, that would have kept Taker OFF Wrestlemania, and (even though it's happened before twice) that could be used as more of a smack in the face.