I'd suggest going back in time preferably to koryu kenjutsu, over Iaido to move forward.
Iaido is koryu.
Just kidding Dan. I'd agree that kenjutsu waza can be more similar to aikido movements, but it's availability is more of a deciding factor than anything else. Good Iaido/Batto should also serve well.