I don't see a problem with Faramir in TTT. Whether he gives it up in Hennuth Annun or Osgiliath, I don't think makes a difference. He still WILLINGLY gave up the ring did he not? TTT EE even goes to show why Faramir chose those actions. I don't see how it weakens Faramir at all, he still willingly gave up the ring (which is a hard thing to do if you're a man, especially the son of a crazy father, and the brother of the person who tried to take the ring). I think the whole Ringwraith spotting Frodo with the Ring should be thrown out, but I don't see a big problem with Faramir taking the ring to Osgiliath, if anything it adds suspense.
This
thread may be of some interest.