Here's a scan of the text I was given for the Nadvera version of Maoz Tzur. Of particular interest is the extra verse at the the end. The rhyming of "chatoai u'p'shoai" with "hashlishi" is forced although visually it looks as though it should work. Also, note the alternate ending to the penultimate verse, "Chasof".