Silva v. Griffin would be a great fight to determine the undisputed #1 contender. You could then take Jardine v. winner of Ortiz v. Evans OR Alexander to determine who should get next shot.
I think it an untenable decision that Houston deserves to fight Wandi. He wouldn't even be discussed if his fights, or hell 1 of them, wouldn't have been a big KO. The KO has become really the selling point for so many fans, but on any given night you could knock ANY fighter out with one jab/hook/uppercut.