I had DD on July 12th, and had a long pushing phase like you, as well as a catheter after she was out.
The clitoris pain you describe was pretty overwhelming for me (enough to bring tears to my eyes), and came when I used the bathroom, or when I tried to do Kegels. It has slowly subsided but I still get it sometimes. My grandmother, who was a midwife in Viet-Nam, suggested that instead of taking sitz baths, I buy a detachable showerhead and aim the water on my parts on a light setting. I do this for 5 to 10 minutes every day. It's really helped heal the small tears and slowly bring back normal feeling to my perenium and clitoris. It's not back to normal (I'm only 4 weeks postpartum mind you), but I can tell it'll go away eventually.