Ambushes only during war

I love the changes in Together We Rule, EXCEPT for ambushes, which have quickly become the single most frustrating mechanic in the game.

 
- You move your army somewhere, but one tile into the movement they stumble on a single spy/prowler who runs away. The army now has no movement points and has basically lost the turn

- You get CONSTANTLY ambushed by Prowlers even when they belong to your own vassals/allies. Moving around the map actually becomes difficult

- The AI spams Prowlers to an absurd level. They're everywhere.
- The constant ambushes create an enormous amount of grievance spam. Again, your misbehaving vassals will get you into trouble by randomly attacking the units of other cultures. It's chaos. 

I understand the idea behind ambushes BUT they should only trigger when you're actually at war with someone. Otherwise, the other interesting mechanics in the game become pointless. Using envoys isn't worth it when the envoys constantly get ambushed and killed by people you have good relations with.