Tony is a good match-up for Conor, but a potentially tough fight for Khabib.
Lando almost had Tony out a number of times, and Lee dropped him briefly in the first in their fight, that wouldn't hold up with Conor. Tony's striking worked against Dos Ajos due to Dos Anjos' weakness to pressure as well as Tony's length. Tony also (a few years back) had trouble with another boxer in Johnson.
Against Khabib he'd be a ground threat, and has the length to keep him shooting from further out which isn't Khabib's forte compared to Lee.