Need advice on hocd and NoFap

Hey guys, this is my very first post. Will try to make it as short as possible, but I'd like to divide it into two parts my PMO story and my questions.

--- Background
Well I don't remember very well when I started PMO'ng but it could probably be around the age of 14-15. I remember starting with the typical pics or soft-P scenes then in time I moved to "straight porn", then some hentai and this is pretty much the only two things I would PMO to. Important to note that some of the hentais I watched had some Futa thingy characters and I think I have only watched one trans scene where there was this person and a woman. Never escalated to more "hardcore" genres. Was never interested in gay or trans scenes, they still gross me out tbh.

--- Key moment
Up until this point I have always being a very easy going person, I would have no problem talking to anyone, picking up girls (I consider myself very handsome ). You know typical stuff young people do.
Well one day I was out with some friends and I remember seeing some blondie from behind and I thought for myself, not too bad, then when this person turned around I realised that this person was a trans girl. Then for no reason I felt ashamed, but not in a guilty way it was more like I was afraid of looking at her/him.
That night I went home I remember I was constantly questioning myself thinking "oh is were you feeling that way because you liked her/him, then you must be gay".

--- Revelation
This event caused me great pain and anxiety, I felt like I was going mad and I starting looking at dudes thinking is that what you like now? Or when encountering some dude that was handsome or buffed I would think oh that dude is strong or whatever, this would give me a lot of anxiety.
Then one day I was on youtube and I saw a video from Noah and while I was watching I felt like he was describing my experience with porn.

--- The present
Been almost 90 days on a NoFap diet. I can say that my anxiety levels have decreased a lot I don't constantly feel that pain in my chest anymore.
Something I'd like to mention is that let's say I am watching something on youtube or on the TV or I am out with my friends and see some dude (sometimes people I have known since before), sometimes I feel like a weird sensation in my testicules and sometimes dick, is like a response to being nervous very weird shit that I have never had before. Have to say that this sensation also happens randomly when I am doing other things, don't know what this is.
Besides that when having an invasive thought I would have an anxiety response to it either an increase in salivation or this pain in my chest that I already mentioned.
There is much more I could tell you guys, but I don't want to make this post too long, I can go into more details if you guys want.

--- Several questions
- Does abstinence help with hocd, this invasive thoughts and recalibrating my sexuality?
- Is there anything in particular you guys think I should do to deal with this annoying issues?
- Any advice on regards of my case would be appreciated.

PS: English is not my first language so don't be too judgemental with my syntax.

PS2: Forgot to mention I am 32 now.