Definitely an improvement. I suggest allowing Tactical and Weapon Style feats to be allowed, in addition to Fighter feats, for the bonus feats.