You might want to consider Burning Wheel again then. It has a seriously good combat system, and you can use it with a stripped down social system easily enough. Use the Fight! subsystem, don't use Duel of Wits (instead using the standard skill system) and you're pretty much there. At that point it's also not necessarily all that crunchy - I think it's best with every subsystem employed, at which point it gets heavier than D&D, but if you start cutting them it gets lighter quickly.