Good points, and my experiences generally follow yours.
For 1. you can (a) lean hard on "the outcome of a roll should (drastically) change the situation" which narratively suggests that doing the same thing over again isn't really logical, and (b) traits that suggest -- or even mechanically...