My money is also on the 747ADV. Other than Emirates (who don't operate 747s), no other carrier has ordered significant numbers of them... in fact after the EK order I think QF might be the next biggerst customer with 12 on order.
There are numerous other carriers out there that have looked passed the A380, yet will need 744 replacements. BA, UA, NW, BR, CI, CX, AF, KE, OZ, NH & JA are just a few of those.... add to that other carriers that HAVE ordered A380s that may still need 744 replacements such as QF, LH, VS & SQ.
Regardless, there is money to be made and aircraft to be sold, and you can bet your bottom dollar that several of those mentioned above will NOT be ordering the A380.
Can't wait to see what happens.