If classes intended to be martial inclined got a free weapon archetype, and could take others with archetypes it would simultaneously fix the issue, and give something like the ranger combat style as a core mechanic instead of a class locked option.
On the topic of casters, given the approach towards sword & sorcery and the limitation on both quantity and quality of spells, it would make more sense to me for every class to focus on combat in some manner.
I noticed this when building my wizards that I've playtested and felt gravitated towards weapons. So I have the idea that wizards should consume the niche of the magus and to an extent the arcanist as both of those classes had means to improve their combat.