Different tenses in same sentence

Ive always had such a hard time with this. The original sentence is: . He ducked as his shoulder slammed into the brick façade of the building and he crashed through the wall, and rolled to his feet as masonry showered the area."

I'm editing a friend's story. To me, "He ducked as his shoulder slammed into the brick facade of the building and he crashed through the wall, rolling to his feet as masonry showered the area". But then I"ve been told rolling is present tense, and the rest of the sentence is in past tense (ducked, slammed, crashed), so can I say rolling? or does it have to be rolled?

thanks