I don't know if you have seen Takeshi Yamashima, but he is another student of Yamaguchi Sensei and a teacher I can recommend highly. Definitely meets your first expectation (and likes a beer afterwards as well). Also definitely not into the "no-touch" stuff...
He is visiting Europe over the next few weeks - in England on the weekends of 30 June/1 July (Manchester) and 7/8 July (Bath), and he usually teaches in Holland, France and Germany too. It may be worth a Google if you are interested.
PS, that's one of the best films of Yamaguchi Sensei I have seen - thanks for posting...
And he'll be back in Hawaii again at the end of July. Very down to earth guy - definitely worth a look if you haven't seen him (or even if you have!).