I think that this fight will be way, way different from the first. In the first fight, Rory was the aggressor in the first two rounds. He stalked Condit down and this caused Condit to back up a lot during the fight. I think this is one of the main reasons that Condit couldn't get much flowing, even if the fight was close heading into the third round. He didn't look like himself in the striking.
His movement was pretty much just backwards the whole time on the feet. This is the reason I picked Diaz to win their fight. I figured he would back him into the cage and rip him apart. However, Condit's movement improved so much. I think he is a way better striker than he was back then, and I can't see Rory winning a fight on the feet with him.
His TDD has improved too, but MacDonald is a great wrestler. I think he can get it to the ground, and he'll do a better job at holding position this time around. Condit is good off of his back, but Rory is really strong.
I think this fight will end up being Condit out-striking Rory, with Rory landing a few TD's. Condit will do more work and damage though, eventually winning a close decision.
P.S. Condit and GSP are the only people in the division that can beat Rory. The guy is a monster.