Only touching your dick is edging?

I adjust myself down there from time to time, if that's what you mean.

I used to watch TV on the couch with my hand sorta shoved a bit down the front. I think a lot of guys' do that. I am trying actively to catch myself and not do it.

 

One important thing here is to not deceive ourselves.
It's a war. The moment you realize you're deceiving yourself, stop it.