I didn't see anyone rank Martin inside the top 2. Because those have been Wahid, Haney and Loma. Maybe Stevenson has an argument but Martin never did imo. Wahid has beaten a decent number of top ten guys and most of them have gone on to have success after, he's just never beaten someone who was considered one of the best at the time he beat them.
Every single fight should have a rehydration clause imo. If he can't safely weigh less than a welterweigh he certainly shouldn't be fighting as a lightweight.