If you want to question the original object of the fight then I'm in agreement with you!
If Faramir had to battle more demons (literal or otherwise) than Boromir then perhaps he was the better fighter.
However, I'm pretty sure we were always talking about physical hand-to-hand warrior combat, and I'd be happy to say that they were equally good.
And who says that Boromir didn't have his personal battles? He didn't take a wife, did he? That leads me to speculate. He clearly wasn't 'normal' in that sense (please realise that 'normal' here is slightly derogatory). How did that go down in Gondor? No siree Bob, it wasn't plain-sailing for Boro.