I'm 100% for non-combat resolutions being "worth it".

That being said, they need some additional measures to prevent over leveling. Whether they cap each chapter, implement diminishing returns, or something else. I hate it when I'm incentivized to do extra murder hoboness to "get that xp" that I don't really need. TBH, milestone XP would make a lot more sense to me across the whole game.