Reduce maximum whistle hole size for optimization, and tweak linear velocity interpolation.
Use fmin instead of fmax for nominal frequency of upper point on the interpolation line:
less likely that nominal velocity will be outside of playing range for that note.