Both will be awful but endurable. NZ may be a bit more pleasant but you have to deal with the stop-over. If they still have it and two of you are flying, the NZ skycouch would be worth a go (if bookable with Air Miles).
My recommendation would be to fly direct on AC and given your height pay the extra to get an exit row/bulkhead seat.