Chips and pitches u do need to factor in green-speed, as a significant portion of total distance is roll. For chips, 2/3 - 3/4 of total is roll, for pitches it can be anywhere in the 25% to 50% range being roll.
Full and punch and flop, most of distance is carry so I don't worry quite so much.