Guerrilla deployment replaced with Paths Seldom Trot for these units:
Hattori Yari Ashigaru
Hattori Bow Ashigaru
Hattori Matchlock Ashigaru
Hattori Yari Samurai
Hattori Bow Samurai
Hattori Matchlock Samurai
Hattori Naginata Samurai
Hattori No-dachi Samurai
Hattori Katana Samurai

The following gained Paths Seldom Trot without losing guerrilla deployment. These units will use vanilla (distant) deployment in ambushes, but still be able to benefit from guerrilla deployment in normal battles. They receive Paths Seldom Trot to somewhat compensate. These units would be meaningless without guerrilla deployment, so I think this is a necessary trade-off.
Hattori Bandits
Hattori Kisho Ninja
Tokugawa Kisho Ninja
Kisho Ninja (the normal one)
Kisho Ninja Hero (Hanzo's Shadows)
Mori Wako Raiders
FoTS Yugekitai Light Infantry
FoTS Kisho Ninja

TROM 3 also adds +1 command during ambushes for Hattori generals, but it requires scripting. I don't feel like going into that, if I start scripting I'd probably get a lot more ideas, it's a timesink I cannot afford. Let's see how this plays out.