15 day trip, want to try nice teas!

Gf and I are going to Japan mid to late April. It is our first trip. We are both intermediate-ish tea sommeliers seeking some phenomenal tea (especially koicha, gyokuro, and kukicha/karigane) and tea experiences like tea ceremonies, picking, milling, blending, rolling, etc.

Since it’s our first time, I would also like to prioritize seeing classic tourist destinations in Tokyo and Kyoto, onsen, and maybe a casual hike or two. Considering this itinerary, I have 2 questions:

  1. Are Shizuoka or Yame worth it? Else, which other city or cities should I spend my time in? We will of course do Uji, but between Osaka, Hiroshima, and Hokkaido as alternatives (or any others that you might recommend) for Shizuoka and/or Yame
  2. What are some of the best tea shops, ceremonies, or experiences you can recommend?

Thanks so much in advance!

by TrickyNegotiation4