I could drop the F1 for most shows if there was a way to make custom kits for the Pattern Player :)
Like just release a separate editor, maybe even with a basic sample kit? All I generally use is the 909 kit to give a few songs some snare, clap or hats.
Once I dropped the other FX bank on my X1 in favor of this I'm already using my F1 live a lot less. You could even incorporate a one-shot feature by just triggering the sample with the on/off button when they're the selected sound :)