If I were to be to show just ONE thing that showed the creative genius of of the WWE, it'd be this angle. Nope, not Austin-McMahon. In my opinion it has far surpassed it in it's quality (or in other words, I'm enjoying this far more despite it only being active for 3 weeks and a payperview).
But no, Triple H isn't trolling. I think they pretty much had all this figured out beforehand. They spaced it all out because it'd be kind of odd to address all the plot holes in one go.