I would say "Yes", as Aikido has more in common with weapon wielding skills than it does with purely pugilistic or grappling arts. The concept of "instant victory" for example is not consistent with most striking or grappling disciplines, but definitely exists in the koryu.
The other aspect is that true self defense should prepare one to use weaponry or have weaponry used against them. Tools (weapons)of all sorts can be used that work on similar principals to those taught through the use of bokuto, jo, or tanto.
I think brush painting, history lessons, Japanese language study, and learning to drink beer are also necessary to understanding Aikido too.