definitely agree on point 1, non combat solutions to bypass encounters should grant XP as if you did the encounter. Otherwise you're penalising players for roleplaying, which is bad.