In regards to weapons training, I would like to add that many of the open-hand techniques are based on weapon's movements, such as the sword stroke.
So by learning how to effectively weild weapons, you are also learning a bit about how to do weaponless techniques.
My dojo doesn't train a lot with weapons(unless I just miss the days they do train w/ them), but the classes are still very effective with much to gain. I think I owe that mostly to a great sensei though.
The sensei you will train under, and the dojo environment are perhaps the most important things to consider when deciding. With a good sensei, you will find everything you seek in aikido.
Good luck in your search,