I think you do a well enough job on your own explaining the inconsistencies. The fight in the TCW movie doesn't take place long after AotC, and the novels as you say (I'm inclined to believe as I haven't read them myself) say that Dooku had the advantage.
The Season 4 first fight on Naboo had Anakin matching Dooku, but I don't think Dooku was taking the fight seriously. He was casually levitating those lamps around, and he showed when he overpowered Anakin with the force that he wasn't trying to kill him, but capture him instead. I know Anakin was shocked in between fighting by the electro staffs, but Dooku dodged two of his blows unarmed and managed to disarm Anakin as well. Also noteworthy is the fact tht as soon as Anakin presented himself a threat with the force, Dooku was immediately able to overpower him.
The second fight on Naboo had the circumstance of the endangerment of Palpatine's life. While to some extent non-canon, I think the RotS novelization shows us the depth of Anakin and Palpatine's relationship and why defending Palpatine is high priority for Anakin. Dooku is clearly driven back, but still overpowers Anakin via the force.
I'd like to note in between the second Naboo fight and the fight on Oba Diah, Dooku still managed to overwhelm Anakin with lightning on Zygerria.
On Oba Diah, I think what Kurk said has merit. Dooku would be highly motivated to not let his Master's identity slip, stating aloud that his required presence spoke to importance of the task. Also, with regards to the RotS novelization, Kenobi's presence prevents Anakin from cutting loose as well right? He doesn't tap into his anger, or break down the walls of fear in his heart. Dooku is hown to be pressed by the duo, but unlike previous fights, his goal isn't to capture or delay, but instead escape.
Them being equals (once again, I'm inclined to believe on this as I haven't read this either) in DD makes sense as this is nearing the end of TCW.