I never really liked the whole "taught by Dooku" reason why Grievous would use a lightsaber. Why would Dooku bother training someone who has no ability to use the force. Surely he would have recruited someone who could.
Also the part where Grievous reveals his true identity to Obi-Wan could be just as the lightsaber fight end and obi-wan does the force push. if you look at that scene Obi-Wan looks suddenly angry as he does the force push so that would fit in perfectly.
The only problem that arises from this, however, is the whole name issue. why would he be called Darth Maul in EP1 then General Grievous in Ep3? I think he is only mentioned by name once in EP1 so to help get around this the line where his name is mentioned could be changed, then there would be no problem with his name in EP3, but getting around the whole "General" part could be more tricky