as usage

[navi tasan]

Are these sentences correct:
1-I would like to face him in battle and break my lance between his ribs, as he did to my father.
(non-restrictive:I would like to commit the same act towards him that he committed towards my father.°
2-I would like to face him in battle and break my lance between his ribs as he did to my father.
(restrictive: In the same manner.)

[gabber]

navi tasan,
That's a keen analysis. You could also substitute "which" for "as" in sentence number 1). A plus.