Tokyo-Kyoto-Osaka but with a JDorama/Taiga spin- looking for recommendations!

First of all a huge thanks to this community- there are so many awesome travelling tips and itinerary checks I have learnt from already.

I am extremely lucky to be able to make my dream trip come true in August/September and I thought I would throw a fun challenge/recommendation plea out there: I would like to include a few side quests to places, buildings or shops that were featured in JDoramas/Taiga dramas, for example:

Hana yori dango: Ebisu Garden Place or Yae no Sakura Taiga: A photo stop at Doshiha University

Kyoto, and Osaka: Castles and shrines/temples might be obvious, but cool drama links appreciated nevertheless

Bonus: I would love to find a Gibo to musume location…

So: What places in Tokyo, Kyoto, Osaka (I am also travelling to Kanazawa/Nikko/Hiroshima) should a J-Dorama/Taiga/Jidaigeki/Asadora fan visit?

Thanks for all your ideas!