Thanks for sharing your experience and thoughts.
The following are just my thoughts and not judgment about what anyone else is doing.
I taught and trained in Self-defense for 16 years along side of Aikido. It was important to me for a long time. I really needed to feel safe and develop skills and strategies.
Then it become not the way for me anymore. The philosophy of Aikido is what makes the difference for me.
Self-defense seems to be focusing on the problem whereas Aikido seems to me to be focusing on the solution. Our dojo will continue to teach Aikido as we see perceive it. I feel the trend may change back to more peaceful arts. When that happens we will accept that, too.