Ah yes, shields need to go down to 1 AP auto as well in my suggestion.
1h + empty should either not be a thing or maybe give a dodge bonus for empty offhand so that it's viable for finesse hybrids or smth.
Either both auto and skills need to cost the same across all styles or AP cost should change for skills as well when using 2h/dw. Otherwise it will never be balanced imo.