Great to hear you're enjoying the game and the content is helpful for getting a game going.
How you ran it is exactly how I run it. Advantage or Disadvantage doesn't come into play often. If there's a clear advantage or disadvantage, then it applies, just like your examples. Shooting someone who's hiding behind a rock is going to be hard (Disadvantage) but the characters role, skill, and weapon still apply, so you still roll Edge dice for those.
Hopefully that helps!