Passing Runners

 
One out, runners on 3rd and 1st. The batter hits a high pop behind the mound. The runners at 3rd and 1st hold near their bases, due to the infield pop-up. The batter-runner rounds first and clearly passes his teammate standing near first base. The pop up is then dropped by the defense but the defense throws to second where the base is tagged for an apparent force-out of the runner that was at 1st base at the time of the pitch. Meanwhile, the runner at 3rd base scored as soon as the defense chose to throw to 2nd base for the force.
 
At the end of playing action, who is safe, who is out, and does the run score?
 
Call
A runner that passes his teammate is out at the moment he passed his teammate (NF 8-4-2m). However, this removes the force on the runner that was at 1st base at the time of the pitch. That runner must be tagged (NF 2-29-3). If the defense only tagged second base (and not the runner), that runner is safe at second (or could return to first base) and the run scores too (NF 9-1-1).

 
If this play started with 2 outs, does your answer change?
 
Call
With two outs, the inning is over as soon as the runner passed his teammate. The runner at 3rd scores only if he touched home before the runner was passed.