I think the champions now are pretty much right. HHH should be a champ for a few more PPVs, then should be ready to shove the title to someone else, a new guy - Hardy is first coming to mind.
Otherwise everyone else is fine, imo. Possibly just change the IC Title to someone a little more...