I am sorry if I seem overly hung up on this issue of enlightenment and martial ability. I just have a hard time seeing that they are the same.
In the general case, no, they are not. Plenty of counterexamples on both sides.
In the specific case of Ueshiba Sensei, though... I'm not sure it's possible to draw a clear line, and I'm not sure *he* drew a clear line in his own mind.