I kinda understand what you're trying to get across TOOL. The card has several matches that aren't needed, or could be replaced with matches that deserve to be on the card. Personally, I'd have the tagteam, US, and IC title defended at Wrestlemania, since they are titles after all, and should be showcased. In addition to that, I'd have them actually BUILD up to Wrestlemania, with all the champions and contenders having matches and cutting promos over the next couple of weeks. We've rarely seen that, because these matches are just thrown on many PPV cards - like Gabriel vs Swagger for the US title at the EC PPV, or Jerry Lawler saying "Truth and Kofi might be in the tagteam title hunt after beating the tagteam champions here tonight on Raw" (are you fucking kidding me? They're a makeshift tagteam that teamed up for just that night, and they're already getting title shots?)
All the champions are great at this time, and they deserve to be at Wrestlemania, because they can draw better than a celebrity match, and those titles need more attention.