Two mysteries and an unexplained ending -- was it re-edited?

There were a couple things I haven't seen explained:

1) Who was the accomplice making phone calls to Mirren in the hotel and subway? He was obviously directing her out of the hotel and into the subway station and onto the subway, and didn't seem like an FBI agent.

2) When was she instructed to go the car park and get into the car? I didn't hear those instructions given at all.

3) When Mirren gets to the car, she opens the trunk and it appears there is a second bag with cash in the trunk. When she gets out of the car, she pulls out the small bag with the diamonds and cash to drop off the viaduct, but she pulls them out of the car interior, not the trunk. What's up with the extra money in the trunk?

At this point in the movie I felt like the movie was finally revealing the real twist -- the kidnapping was actually setup by Mirren herself as a way to end her marriage after years of disappointment with her husband's non-stop career and affair.

It feels like the movie was actually meant to be about this kind of caper, but someone decided to make it about loner/loser Dafoe's "big accomplishment".

If you think about it, the plot seems perfect:

1) Mirren sets up the dinner with people her husband doesn't really like. This gives her the perfect alibi, as her whereabouts have witnesses, including a call to her husband's office (identifying herself) and to his cell phone from her home phone.

2) Dafoe is a cutout tracked down from her husband's past, convincing him to go along with the plan as a way to cash out and improve his life and get revenge against her husband, implying he was responsible for his layoff. Whatever scenes establishing this were cut out. The mysterious hotel/subway caller could have been her true accomplice who tracked down Dafoe as someone who had been fired and dropped out and could have been recruited to do the actual kidnapping. The parts not cut were Mirren delivering Dafoe's cut of the money, and the trunk scene was her switching out most of the money & diamonds from the bag she had to another bag, basically creating Dafoe's smaller cut of the money.

3) The ending is mostly as it was, watching Dafoe admit what he'd done but since he didn't know Mirren as behind the plot, there was no way for him to inform on her.

As presented, the movie lacks any sufficient motivation for Dafoe to go through with this crime and an especially tenuous link to Redford's character. Mirren's behavior around the FBI and her kids is a little too stoic for a woman whose husband has been kidnapped and has no idea what's happening.

Mirren has plenty of motivation for wanting out of her marriage -- the overworking, cheating husband, the fact that despite making it big her life is kind of an empty sham. It really seems like Mirren as kidnapping mastermind was the original movie, and someone wanted it re-edited to be more "dramatic" and less of a "twist" thriller.