Now I'm worried that I haven't seen the right version. Is there a breakdown of the different versions floating around somewhere?

There was a release, perhaps the lazerdisk box set not sure, that had both the theatrical cut and a (I believe) BBC tv edit. Although the BBC tv version could be characterized as more up beat, the commentary and inclusion in the box showed it great respect. They discuss the editing choices that needed to be made to reframe the story as if it had been conceived that way from the beginning.

It's one of the most educational discussions of cinematic storytelling and editorial technique. It is absolutely worth seeing both versions and listening to the commentary if you can find them.

Well, without spoiling anything in particular, let me just say this. Do you feel it was a happy ending? If so, it is probably not the director's cut.

Ah. The reason I ask is that the ending I saw could be interpreted either way, but I saw the 'happy' ending as obvious satire/irony. I'm just worried that I saw the wrong ending and over-interpreted it.

It sounds like you saw the "Love Conquers All" version, but saw through the illusion. It's actually part of the original ending, but with all the framing of the scene removed. Definitely check out the director's cut.

The Brazil CC is amazing, and also includes the "happy" version the studios forced to exist, so you can compare.