ve solved the second problem by replacing Combat rules with general ‘Contest’ rules – a single system for Extended and Resisted actions, which works for Investigations, competing companies, or snide remarks at Elysium…and sword fights, if you must.
This is how Fate works and I like the idea a lot.
I toyed with having social conflict in CofD (close relative to WoD) use the same rules as combat, but attack willpower instead of health. So screaming at someone is presence + intimidate instead of strength+brawl. Seemed like it would work on paper. Don't have any players at the moment to try it with.