You're right. And he also uses a variation of blade beam against Loz, and omnislash.

Also, when Cloud and Tifa were talking in the room, did you see the drawings of the two of them by the kids on the walls?