Had to edit out the spoiler in the title, you generally have to wait 24 hours before publicizing spoilers without a warning. You're good though.
I don't think Taker was a one off thing in my opinion, he'll probably face Lesnar at SummerSlam and get his revenge. As for Rollins' opponent, I'd go...