Yes there's no incentive to find a non-violent way out of an encounter if the result is you miss out on XP. Finding non-violent ways out of encounters should also be rewarded comparably.
True, but 5e also got this covered - basically everything, from non-combat and social encounters, to traps and skill checks, can be assigned a challenge rating (CR), and thus a corresponding XP value.
