I matched out the effects of the different fighting styles and upgrade feats for different classes, took into account drawbacks (free-hand access, investment required, number of magic items required for equal effects, etc), and here's what I decided.
I keep the rules as-is except that I allow...