Smackdown- How to improve

Smackdown although very good, and my favourite brand, still needs improving.
First it needs to have some new main eventers, at the moment it's very scarce on them with only really three, one old and is only there for half a year(Undertaker.), one who could carry the brand but is getting really stale when around the title, and of course Botchista. On the othe rhand, on Raw they are swimming with people who could be in the main event. You could move over, Umgaga, Shawn Micheals or Jericho, Mr. Kennedy, and move up MVP, and CM Punk and you have a great main event, they don't all have to be with the titles, and they could all mix with the mid card. With those you have some great feuds and matches.
This may leave a problem on Raw, with no one filling the ranks there, so in the ned it's one big spiral. Which in my eyes, theres only one real solution, and that is to allow more freedom of moving around the brands, with this system you would have fresh feuds and matchs, every other PPV and it will keep everything new, and then when people are good enough they can move up into the main event, and people who are getting old and can move down, it's very free and flowing.

Thoughts?

IF Batista moved to RAW, it would leave Taker and Edge.

To improve smackdown id have Taker put in a non title feud with Umaga, move HBK over push Punk and MVP to the main event, have the mid card with Matt Hardy, Morrison, Burke, Carlito and Kofi Kingston, even Rey Mysterio although id rather see him on ECW.

would vastly imrpove the show, Smackdowns main event is too thin atm, although Edge has made it worthwile watching.

The flow system could even work for people like HHH and 'Taker who don't want to move brand, as people are moving around so they still have new feuds without moving.