Overnight I would go all the way AA as I prefer their seat and the aisle access. If it was a day flight, I would have preferred CW due to better service and f&b.
but, as always, a very personal point of view.
As per the upgrade, I would not bet on it honestly...