Anywho... I don't have a problem with KENTA being the champ. My problem comes from the fact that Danielson has to have ATLEAST 1 pinfall/submission victory over KENTA to save face.
Maybe have Danielson drop it to Homicide, Homicide drop it to KENTA after Corino interferes (extending that feud, and screwing Homicide over without having him look weak) And then down thel ine, after various defenses, maybe have an elimination three way where KENTA is eliminated by Dragon, and then Homicide eliminates Dragon. Then everyone looks golden, and Homicide gets his reign