My honest first thought (and vote) was for Loki, but after reading the responses here, I think I underestimated how formidable a foe Nimrod could be...he just might be able to eventually beat Thanos.
Waverider should do very well also, but I think Thanos eventually figures a way around his time manipulative ability...