Just to note: Although my practice is based in Nishio Aikido, I started aikido in 1988 at NY Aikikai. Among my first teachers were Yamada, Sugano, Donovan, Harvey, Hal, Rick, Angel, Tina, Claire, and others there. This interview with Yamada even demonstrates that he's tired of the water. I find this quite encouraging.
http://www.aikido-yamada.eu/index.php/sensei/interview/