McGregor vs. Diaz -- Rematch in the Works

Conor McGregor might get his wish after all ... 'cause the UFC is reportedly finalizing a rematch between the UFC superstar and Nate Diaz ... TMZ Sports has confirmed.

The fight would go down at UFC 200 in July ... so says MMAFighting.com's Ariel Helwani who says the UFC is hoping to announce the fight in the very near future.

Over the weekend, McGregor told TMZ Sports he would LOVE another shot at Diaz -- insisting he was winning the fight until Diaz took over in the 2nd round.

"I would love to get that one back," McGregor said.

Stay tuned ...