I already mentioned a while back that the best way around save scumming for story elements at least, is to make outcomes of your choices only transpire further down the road.
The immediate consequence of a decision promotes save scumming as it becomes obvious what is "good" and what is "bad", Give me grey and then later on let me find out what that decision meant, either way.