Should Faramir have been in the Fellowship?

[Leona]

I think the entire story would have changed if Borimir was not in the Fellowship. If not for him, Frodo would never have left. Without Borimir the fellowship wouldn't have scattered at that exact moment, making Frodo's ecape imposible.
If Faramir had taken Borimir's place, would Faramir have been driven the same way? Or would he have kept his temper and not scared Frodo?
I think, too much of the story direction lies in Borimir, and not Faramir traveling with Frodo.