And so it all changes once again.
Thanks to Etihad's amazing release today coupled with the AU AA office I have now dropped BKK-DOH (QR F) -JFK (QR J) and turned it into BKK-AUH (EY J 77W) - JFK (EY F A380).
Get the best F there is and add on 12 hours to my stay. Success!