Another great report olafman!
Like you, I also have the Emirates A380 shower experience on my list and was thinking of doing exactly the same flight that you did. My only fear is that with a 3 hour flight time, it isn't really enough time to take in the full experience.
Have fun in NZ.