Could also consider making some tones a wavetable if they are particularly dynamic. That might be more effort than you want to put in, though