Yeah - that's the one. And I agree - the editing, directing and music was awesome.
And when you say the German one has 'all the different possibilities', so you mean that in the other versions it was just one storyline? Wasn't the different possibilities kind of key to the whole movie?
The end of the one I saw was a bit of an anti-climax though. I was expecting the tramp to come back with the gun and shoot someone.