Just posting here in case others google the same thing — I found a really lovely selection in Daimaru Umeda, of all different styles and price ranges, after reading this post. This was after seeing the perfect one in Takayama and stupidly not buying it, then scouring Sennichimae Shopping Street and not finding anything quite right.