BA F in a heartbeat (and I love AA).
The wines, service and soft product just cant be matched by AA. Whilst I actually prefer the AA seat, new first on that route makes the difference in hard product very small indeed. Together with the soft product and its a no-brainer.
Plus query if the £399 upgrade would be offered on AA metal?