I think you should give up porn, maybe permanently.

You've developed an unhealthy relationship with it, and are now trying to still use it in a more healthy way, but it doesn't change the unhealthy relationship that's already there. Just like a cocaine addict can't have cocaine even once in a while, and alcoholics need to abstain from alcohol all the time.

You're having urges that are your normal sexual urges being a healthy man, but your brain is still tying those urges to watching porn. So you're really not better than you were before.

Ask yourself, what value does porn bring you at this point that masturbating without porn wouldn't? Not much right?

I'd follow the advice of others here, and go see period of time without porn and masturbation to let your brain reset, and then reintroduce masturbating only in a "when needed" way. I think then you might have some progress.