AIr NZ have said that passengers will only be able to book one x 4 hr session per trip.  

Absolutely correct. Dubai (and Abu Dhabi) are tolerant provided there is no parading of sexuality. Like Singapore, they couldn't care less really, providing you are using hotels, restaurants and stores. Both cities, and airports, offer great stopovers. It just depends if you want to do 8hrs +...