I've also been impressed by NZ's economy legroom and service (good NZ wine from real bottles and no reasonable limit on top-ups). My experience of AF in Europe has not been good so I've never been motivated to try them for long-haul (almost always an extra leg anyway, unless you're headed for Francophone Africa).
I assume you're looking at these two for the cheapest rates - if you (or better someone else) are paying full ecomony fare then look at Virgin Premium Economy (which I've used) or BA World Traveller Plus (which I haven't) - you get a Club size seat without the expensive Club trimmings.