Re: bokken vs bokken?
In Korindo Aikido we have weapons training, which even includes Weapons Randori:
Boken Vs Boken,
Jo Vs Jo (Though that is non traditional)
Jo Vs Boken
Bo (RokShakuBo) VS Bo
Wakizashi Vs Wakizashi
But then again in Korindo Aikido the philosophical content does not object so strongly to killing as you seem too (at least to my best understanding) and the weapon work comes from the collection of Koryu learnt by Korindo Aikido founder and his senior students.