In my understandign aikido begins when all this doesn't work. When a conflict get's physical. Then aikido is a method to deal with an opponent or attacker in a certain way.
This means using aiki / the structure of ones body instead of pyhsical strentgh. And having a peacefull mind. Even if using strong waza.
This to me is aikido.

And that's why I'm confused to some extent: Being aware, dealing with a conflict before it becomes physical or being "non-aggressive" (whatever that means) is not, what "is called" aikido in my context.

(I also teach seminars of "self-defence 'light'". There some aikido is done.)