Clarification on opposed checks

By fent, in Star Wars: Edge of the Empire RPG

Myself and some friends have been running a FFG Star Wars campaign, and we are all relatively new (GM included). One thing we got kind of hung up on in a session was determining the dice pool for an opposed check. We think we got it right, but wanted clarification. Let me set the situation...

My character attempted to use the Move force power to move an enemy towards a friendly target. I roll my force die and spend 3 points to activate move, a strength upgrade, and a range upgrade. At this point, the nemesis opposed this of course. We decided that it would be contesting discipline checks. My character has Willpower 3 and Discipline 2. The enemy has Willpower 3 and Discipline 3. With this in mind, would the assembled dice pool be: 1 Ability, 2 Proficiency, and 3 Difficulty die, or 1 Ability, 2 Proficiency, and 3 Challenge Die?

1 Ability, 2 Proficiency, and 3 Challenge. You factor in both the opponent's Characteristic and their Skill.

For opposed checks, you figure out what their positive dice pool would be and then "invert" it. Ability dice become difficulty dice and proficiency dice become challenge dice.