The stormy Wilhelms in ANH and ESB are rather subtle which is why they don't grate on me much I would be more for toning them down across the rest of the saga rather than ramping them up here.
I'd tone down the "I've got a bad feeling about this" instances too, I appreciate that they are sort of expected to be there but they did open the door to cut and paste dialogue running amok in the PT.