3) Get rid of the champ/champ fights for titles.
If a champ wants to fight for a belt in a different weight class then let them drop the belt they have.
If a champ wants to fight a champ in a different weight class and doesn't want to drop the belt then the belt of the other weight class is not on the line.
If this is an issue, then you cna always have a superfight belt made up that the winner of the fight can have. So say DC wanted to challenge Stipe. He would have to drop the 205 belt to do so, or you could have them fight for a superfight belt.