I would go with Goju. I have been practising Gojuryu (not the USA variant), genwakai and wadoryu for 20 years and because of a move to a remote area, I had to switch to Shotokan, in order to keep connected to a Dojo. Shotokan is quite different, since it is sports orientated, whereas Goju was arts orientated. Many "handy" techniques in Goju, like using a lock after for instance a jodan uke, are not allowed in Shotokan. Last week, I did an "ancient" geri, which is only seen in Shitoryu and Gojuryu. My opponent was quite stunt, I must say. I would do with Goju, if I was in your position.