Same wind with less waves gives you more power (more speed, more apparent wind), so you probably don't want to apply a lower scale in this case. Why don't you go and vote the wind conditions after each race? The mean value in knots then can decide your scale. Most sailors are quite good at guessing wind speeds.