Will choose Etihad for the direct aisle access at 1 2 1 ... Qatar still has 2 2 2 seat config.
Also, if your ticket is booked on J/C/D/W, then you can have a chauffeur drive up to 70 miles from airport. Etihad will discontinue chauffeur service for passengers booked on Z and if the booking has been made on November 7 onwards (as per Etihad call center yesterday). If you book before November 7, they told me that they are still going to provide the service regardless on which date you are flying...