At the risk of beating a dead horse...
I think that you should try a number of different dojo, if different styles are available in your area. I think the style becomes less important as you progress. What is important is the atmosphere of the dojo, the investment the instructor has in the students, the sense of community in the dojo and the openness to other training.
It's easy to say Yoshinkan or Aikikai has a more appropriate style based on how you perceive your learning style. My experience has been that it doesn't matter what the school says on paper, it only matters what they do on the mat. That is the only true measure. Good luck and have fun!!!!