I think I'll go with remaking the Gunslinger. It... has too many moving parts to be made into a discipline, and I'd hate to have to break it down from what it currently is.
That's a good point... I'm not sure how to fix that. Gaining the patterns as you level doesn't feel quite right. Maybe... starting with all patterns, but no tactics, gaining them as you level? That feels better considering you need the patterns active in order for the tactics to work, but you don't necessarily need tactics for the patterns to work on their own.