Not only do I agree with you on this, but I don't think he should lose at Wrestlemania. There are very few truly special things in wrestling anymore, and this is one of them. The only reason Taker should lose is if Taker himself is basically demanding that he put someone over, and I don't see that happening. I'm all for Benoit/Taker, but Taker should win.
The problem is that the wrestling business is not about winning streaks. When you build something up so much like his streak. It's going to be a natural (and in my opinion, the correct) thing to do is to pay it off by having someone end it. Goldberg's streak had to end sometime, and if used on the right guy, it would have gotten the guy over. It just happened to be Kevin Nash. Taker's streak needs to end.