I dunno, I think if you put up Johny's serious KO win over Fitch and two somewhat close victories over Pierce and Kos against Kampmann's decision over Story and his walkoff homeruns over the extremely surging Ellenberger and big name Alves, I think you get something very close to a "push" and thus, a matchup between the two is a great decider fight to see who gets winner of GSP/Condit(although I don't understand where Diaz fits in here upon HIS return?).
While I think they both make very even arguments for the #1 contendership at WW, I think that factoring in Kampmann's razor-thin decision losses to Shields and Diego, which I personally believe he won, I'd give Martin the slightest of edges over Henricks.
MY MMA RANKINGS
HW Cain JDS Werdum Cormier Barnett Bigfoot Overeem Mir Browne Nelson
LHW Jones Machida Evans Hendo Goose Teixeira Davis Shogun Mousasi Bader
MW ASilva Belfort Weidman Jacare Okami Rockhold Kennedy Consta Bisping Boetsch
WW GSP Hendricks Condit MacDonald Diaz Maia Fitch Kampmann Ellenberger Pyle
LW Bendo Alvarez Grant Melendez Thomson J.Miller Diaz Pettis Chandler dos Anjos Gray
FW Aldo Mendes Curran Lamas Frankie Zombie Cub Lentz Kawajiri Siver