I'm surprised encounter XP isn't the same as kill XP. That absolutely should be the case, doing anything else discourages problem solving.