This leads to a situation where to be good at social skills you have to sacrifice combat ability.
That's actually great design imo. Tough decisions and trade-offs. That's the way it should be and I defintely don't want them to change that.
And tbh you don't need that much combat ability to be able to complete the game and win every encounter...