If you have issues with ranged combat, don't twist the rules. Just houserule.
My approach was to improve the non PAM+GWM/SS+XBE cases:
1. Feats to compete with XBE/PAM. Blade, Axe, Hammer, Bow, Sling. Also, tweaked XBE to do something more for the 2 handed xbows.
2. Modified DW to compete with GWM/SS. (The core is "if you have advantage, a lower die can hit with the offhand weapon")
3. Buffed shields (in your hands) by letting you sacrifice them to get resistance to a spell or an attack. Magic shields get "free" uses of this without destroying them. (This effectively competes with DW/GWM/SS)
4. Added Spellcasting Focus feats that are similar in power scale to PAM/XBE. (feats you'd consider taking instead of +2 to your spellcasting stat)
5. Added Elemental-specific feats that are similar in power scale to GWM/SS. (feats you'd consider taking instead of +2 to your spellcasting stat)
As a bonus, if you want to CharOp, you can't just look up builds online. Which is more fun. And it means if you didn't charop, the odds that your specific setup is ameniable to one of the above is more likely; nearly every fighting style is now represented.