I'd rather see Khan fight him. People saying Khan will lose to this version of Maidana. I doubt it, and I think Khan will dominate Maidana in a rematch.
If it had to be one or the other I'd say Khan vs Maidana II. For one thing, Khan v Maidana was pretty good in it's own right and because I'd rather see Mayweather's last fights be against new and different opponents.
Khan Vs Maidana II Matthysse Vs Garcia II or Broner undercard = $$$ People need to start buying good fights rather than paying for the kind of **** Floyd puts on.