Thanks! I figured I'd go into a shop or two in Takamatsu and see what I can find out after I arrive. I'm sure I could communicate ok in person, but my Japanese is a little rusty for the phone.
I was hoping I could find a dive buddy near me, but this might take some work... :)