My own personal preference is usually to lean in favor of noncombatants rather than run something more strictly for combatants. Playing primarily RPG characters, I'm usually able to easily participate in either combat or noncombat events but a noncombatant character is 'locked' to whatever doesn't involve combat, and may be locked out of an event entirely if it's heavily centered on fighting. So usually erring on the side of 'not enough combat' still means that characters aren't locked out entirely due to a lack of skill/their heart recently exploded/their only fighting skill is cardfighting/etc.etc.

Another solution for this is to keep combat a primary focus, but allow characters to go off and do weird things to aid in the fight. I usually have most fun in a fight thread when I can compensate for my character's lack of skills by exploiting the terrain in some way, like removing a door to use it as a shield/luring monsters into a hole/etc.etc. So fight sequences with some detail given to the environment could offer creative noncombatants a way to handle a fight in an unconventional way without having to rely on their keys' Care Bear stare feature.

That tends to be my own personal preference though, but there's definitely more room for adding key features that could be used in fights though I admit I'm blanking on what they could be.