I'm actually starting to think that, rather than giving xp per combat, I might want to give xp for combat in a session. Basically, figure out some numbers for little combat in a session (less than 1/3), a moderate amount of combat in a session, and most of the session is combat (more than 2/3)...