We definitely need to be awarded XP for successfully completing an encounter in a non-violent way avoiding combat. As it stands (similar to the problem DOS2 had) the game awards killing everything for XP. This is not optimal and it would be best to award players that choose non-combat solutions as well without penalizing them. Two good ways are the following:
1) Have encounters award a certain number of XP independently on how you solve them. If you kill them, get the XP. If you avoid the combat successfully get the same XP. If you avoid successfully the combat and then decide to kill them anyway, get only the same XP and not double the amount.
2) Milestone leveling. Get to a certain level once you reach certain points in the game.